From 1d10a354274c16d943494ac7707e6165ba04c30d Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Tue, 10 Mar 2020 12:32:14 +0300 Subject: [PATCH 1/5] Fix icon doubling --- .../dashboard/scheduledtasks/scheduledtasks.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js index 2c665a4403..10ea0538d3 100644 --- a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js +++ b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js @@ -49,7 +49,7 @@ define(["jQuery", "loading", "events", "globalize", "serverNotifications", "huma html += ""; html += ""; if (task.State === "Running") { - html += ''; + html += ''; } else if (task.State === "Idle") { html += ''; } @@ -90,16 +90,23 @@ define(["jQuery", "loading", "events", "globalize", "serverNotifications", "huma return html; } + function setTaskButtonIcon(button, icon) { + var inner = button.querySelector("i"); + inner.classList.remove("stop"); + inner.classList.remove("play_arrow"); + inner.classList.add(icon); + } + function updateTaskButton(elem, state) { if (state === "Running") { elem.classList.remove("btnStartTask"); elem.classList.add("btnStopTask"); - elem.querySelector("i").innerHTML = "stop"; + setTaskButtonIcon(elem, "stop"); elem.title = globalize.translate("ButtonStop"); } else if (state === "Idle") { elem.classList.add("btnStartTask"); elem.classList.remove("btnStopTask"); - elem.querySelector("i").innerHTML = ""; + setTaskButtonIcon(elem, "play_arrow"); elem.title = globalize.translate("ButtonStart"); } $(elem).parents(".listItem")[0].setAttribute("data-status", state); From e016836d3e353590eb9a78523d55d45df1d4dbbb Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Tue, 10 Mar 2020 12:44:42 +0300 Subject: [PATCH 2/5] Fix library icons in WebOS 4 --- src/components/cardbuilder/cardBuilder.js | 2 +- src/components/homesections/homesections.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 3e54f91ee8..ab4f857485 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -1484,7 +1484,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana function getDefaultText(item, options) { if (item.CollectionType) { - return '' + imageHelper.getLibraryIcon(item.CollectionType) + '' + return '' } switch (item.Type) { diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js index 430c06bc57..b024528549 100644 --- a/src/components/homesections/homesections.js +++ b/src/components/homesections/homesections.js @@ -183,7 +183,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la for (var i = 0, length = items.length; i < length; i++) { var item = items[i]; var icon = imageHelper.getLibraryIcon(item.CollectionType); - html += '' + icon + '' + item.Name + ''; + html += '' + item.Name + ''; } html += ''; From 13a03b6e2cea3c21d1e91270966f985d920e6300 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Tue, 10 Mar 2020 12:57:09 +0300 Subject: [PATCH 3/5] Fix slideshow button icons in WebOS 4 --- src/components/slideshow/slideshow.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/slideshow/slideshow.js b/src/components/slideshow/slideshow.js index 40d87e9519..4d426f2484 100644 --- a/src/components/slideshow/slideshow.js +++ b/src/components/slideshow/slideshow.js @@ -70,7 +70,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f var tabIndex = canFocus ? '' : ' tabindex="-1"'; autoFocus = autoFocus ? ' autofocus' : ''; - return ''; + return ''; } function setUserScalable(scalable) { @@ -201,14 +201,16 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f function onAutoplayStart() { var btnSlideshowPause = dlg.querySelector('.btnSlideshowPause i'); if (btnSlideshowPause) { - btnSlideshowPause.innerHTML = "pause"; + btnSlideshowPause.classList.remove("play_arrow"); + btnSlideshowPause.classList.add("pause"); } } function onAutoplayStop() { var btnSlideshowPause = dlg.querySelector('.btnSlideshowPause i'); if (btnSlideshowPause) { - btnSlideshowPause.innerHTML = ""; + btnSlideshowPause.classList.remove("pause"); + btnSlideshowPause.classList.add("play_arrow"); } } @@ -365,8 +367,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f } function playPause() { - - var paused = dlg.querySelector('.btnSlideshowPause i').innerHTML !== "pause"; + var paused = !dlg.querySelector('.btnSlideshowPause i').classList.contains("pause"); if (paused) { play(); } else { From b348c69844c6dd7eecc4a1a3a05eef0d0d29592f Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Tue, 10 Mar 2020 12:59:36 +0300 Subject: [PATCH 4/5] Fix emby-collapse icon in WebOS 4 --- src/elements/emby-collapse/emby-collapse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/elements/emby-collapse/emby-collapse.js b/src/elements/emby-collapse/emby-collapse.js index 600af55516..fdd77adf0b 100644 --- a/src/elements/emby-collapse/emby-collapse.js +++ b/src/elements/emby-collapse/emby-collapse.js @@ -80,7 +80,7 @@ define(['browser', 'css!./emby-collapse', 'registerElement', 'emby-button'], fun var title = this.getAttribute('title'); - var html = ''; + var html = ''; this.insertAdjacentHTML('afterbegin', html); From ed25f0bac1c884a789bbcb0e1df07d35e28d51ec Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com> Date: Tue, 10 Mar 2020 19:00:51 +0300 Subject: [PATCH 5/5] Update src/controllers/dashboard/scheduledtasks/scheduledtasks.js Co-Authored-By: Julien Machiels --- src/controllers/dashboard/scheduledtasks/scheduledtasks.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js index 10ea0538d3..390fd17353 100644 --- a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js +++ b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js @@ -92,8 +92,7 @@ define(["jQuery", "loading", "events", "globalize", "serverNotifications", "huma function setTaskButtonIcon(button, icon) { var inner = button.querySelector("i"); - inner.classList.remove("stop"); - inner.classList.remove("play_arrow"); + inner.classList.remove("stop", "play_arrow"); inner.classList.add(icon); }