From 7cb83755e67205657239fc04dfc673cf80623890 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sat, 7 Mar 2020 13:15:30 +0300 Subject: [PATCH 1/4] Fix recording button icon --- src/components/recordingcreator/recordingbutton.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/recordingcreator/recordingbutton.js b/src/components/recordingcreator/recordingbutton.js index a32803e107..576fa59d59 100644 --- a/src/components/recordingcreator/recordingbutton.js +++ b/src/components/recordingcreator/recordingbutton.js @@ -21,6 +21,13 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom' } } + function setButtonIcon(button, icon) { + var inner = button.querySelector('i'); + inner.classList.remove('fiber_smart_record'); + inner.classList.remove('fiber_manual_record'); + inner.classList.add(icon); + } + function RecordingButton(options) { this.options = options; @@ -30,7 +37,7 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom' this.refresh(options.itemId, options.serverId); } var button = options.button; - button.querySelector('i').innerHTML = 'fiber_manual_record'; + setButtonIcon(button, 'fiber_manual_record'); var clickFn = onRecordingButtonClick.bind(this); this.clickFn = clickFn; @@ -80,7 +87,7 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom' var options = this.options; var button = options.button; this.item = item; - button.querySelector('i').innerHTML = getIndicatorIcon(item); + setButtonIcon(button, getIndicatorIcon(item)); if (item.TimerId && (item.Status || 'Cancelled') !== 'Cancelled') { button.classList.add('recordingIcon-active'); From 9bf8731a59532315b8650ac7bc8f0f37dcefd918 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sat, 7 Mar 2020 13:21:35 +0300 Subject: [PATCH 2/4] Move setting of the default icon before the actual one --- src/components/recordingcreator/recordingbutton.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/recordingcreator/recordingbutton.js b/src/components/recordingcreator/recordingbutton.js index 576fa59d59..e9c174bfd6 100644 --- a/src/components/recordingcreator/recordingbutton.js +++ b/src/components/recordingcreator/recordingbutton.js @@ -31,13 +31,15 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom' function RecordingButton(options) { this.options = options; + var button = options.button; + + setButtonIcon(button, 'fiber_manual_record'); + if (options.item) { this.refreshItem(options.item); } else if (options.itemId && options.serverId) { this.refresh(options.itemId, options.serverId); } - var button = options.button; - setButtonIcon(button, 'fiber_manual_record'); var clickFn = onRecordingButtonClick.bind(this); this.clickFn = clickFn; From dcaa87e4cb85a4be40a44a04653b8c2c05c5fbcc Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sat, 7 Mar 2020 17:23:31 +0300 Subject: [PATCH 3/4] Fix brightness indicator --- src/components/playback/brightnessosd.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/playback/brightnessosd.js b/src/components/playback/brightnessosd.js index 47551e8de6..e73fc39689 100644 --- a/src/components/playback/brightnessosd.js +++ b/src/components/playback/brightnessosd.js @@ -98,15 +98,22 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia } } + function setIcon(iconElement, icon) { + iconElement.classList.remove('brightness_high'); + iconElement.classList.remove('brightness_medium'); + iconElement.classList.remove('brightness_low'); + iconElement.classList.add(icon); + } + function updateElementsFromPlayer(brightness) { if (iconElement) { if (brightness >= 80) { - iconElement.innerHTML = ''; + setIcon(iconElement, 'brightness_high'); } else if (brightness >= 20) { - iconElement.innerHTML = ''; + setIcon(iconElement, 'brightness_medium'); } else { - iconElement.innerHTML = ''; + setIcon(iconElement, 'brightness_low'); } } if (progressElement) { From acd9fe92b80b1e822ed14df26e3869565eb8ea2b Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sat, 7 Mar 2020 17:40:05 +0300 Subject: [PATCH 4/4] Fix sort button icon --- src/controllers/list.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/controllers/list.js b/src/controllers/list.js index 6e25242a01..bcc38f27cf 100644 --- a/src/controllers/list.js +++ b/src/controllers/list.js @@ -157,6 +157,12 @@ define(["globalize", "listView", "layoutManager", "userSettings", "focusManager" return query; } + function setSortButtonIcon(btnSortIcon, icon) { + btnSortIcon.classList.remove("arrow_downward"); + btnSortIcon.classList.remove("arrow_upward"); + btnSortIcon.classList.add(icon); + } + function updateSortText(instance) { var btnSortText = instance.btnSortText; @@ -175,7 +181,7 @@ define(["globalize", "listView", "layoutManager", "userSettings", "focusManager" var btnSortIcon = instance.btnSortIcon; if (btnSortIcon) { - btnSortIcon.innerHTML = "Descending" === values.sortOrder ? "" : ""; + setSortButtonIcon(btnSortIcon, "Descending" === values.sortOrder ? "arrow_downward" : "arrow_upward"); } } }