From 4b99f00552ef128bafd68f3a9a6eafd6037935c9 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Sun, 23 Feb 2020 01:22:55 +0300 Subject: [PATCH 1/4] move underscore Icon to class --- src/components/cardbuilder/cardBuilder.js | 8 ++++---- src/components/cardbuilder/chaptercardbuilder.js | 2 +- src/components/channelmapper/channelmapper.js | 2 +- src/components/directorybrowser/directorybrowser.js | 2 +- src/components/imagedownloader/imagedownloader.js | 4 ++-- .../libraryoptionseditor/libraryoptionseditor.js | 2 +- src/components/metadataeditor/metadataeditor.js | 4 ++-- src/components/remotecontrol/remotecontrol.js | 2 +- src/controllers/dashboard/notifications/notifications.js | 6 +++--- src/controllers/devices.js | 2 +- src/controllers/dlnaprofiles.js | 2 +- src/scripts/editorsidebar.js | 2 +- src/scripts/librarybrowser.js | 2 +- src/scripts/librarymenu.js | 4 ++-- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 4e589c4a1..472585674 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -1497,13 +1497,13 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana case 'Person': return 'person'; case 'Movie': - return 'movie' + return 'movie'; case 'Series': - return 'tv' + return 'tv'; case 'Book': - return 'book' + return 'book'; case 'Folder': - return 'folder' + return 'folder'; } if (options && options.defaultCardImageIcon) { diff --git a/src/components/cardbuilder/chaptercardbuilder.js b/src/components/cardbuilder/chaptercardbuilder.js index 75b940285..02d583abc 100644 --- a/src/components/cardbuilder/chaptercardbuilder.js +++ b/src/components/cardbuilder/chaptercardbuilder.js @@ -90,7 +90,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'layoutManager', 'browse var cardImageContainer = imgUrl ? ('
') : ('
'); if (!imgUrl) { - cardImageContainer += 'local_movies'; + cardImageContainer += ''; } var nameHtml = ''; diff --git a/src/components/channelmapper/channelmapper.js b/src/components/channelmapper/channelmapper.js index 2b2de1870..1b536f440 100644 --- a/src/components/channelmapper/channelmapper.js +++ b/src/components/channelmapper/channelmapper.js @@ -84,7 +84,7 @@ define(["dialogHelper", "loading", "connectionManager", "globalize", "actionshee html += "
"; html += "
"; - html += ''; + html += ''; return html += ""; } diff --git a/src/components/directorybrowser/directorybrowser.js b/src/components/directorybrowser/directorybrowser.js index 06f7773cf..b71f7bbb0 100644 --- a/src/components/directorybrowser/directorybrowser.js +++ b/src/components/directorybrowser/directorybrowser.js @@ -76,7 +76,7 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper- html += name; html += ""; html += ""; - html += 'arrow_forward'; + html += ''; html += ""; return html; } diff --git a/src/components/imagedownloader/imagedownloader.js b/src/components/imagedownloader/imagedownloader.js index f984ce22a..ce53b5cf0 100644 --- a/src/components/imagedownloader/imagedownloader.js +++ b/src/components/imagedownloader/imagedownloader.js @@ -117,7 +117,7 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader' html += '
'; html += ''; - html += ''; + html += ''; html += '
'; } @@ -277,7 +277,7 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader' if (enableFooterButtons) { html += '
'; - html += ''; + html += ''; html += '
'; } diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js index f9f63c9b5..010af4a1d 100644 --- a/src/components/libraryoptionseditor/libraryoptionseditor.js +++ b/src/components/libraryoptionseditor/libraryoptionseditor.js @@ -58,7 +58,7 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct for (var i = 0; i < plugins.length; i++) { var plugin = plugins[i]; html += '
'; - html += 'live_tv'; + html += ''; html += '
'; html += '

'; html += plugin.Name; diff --git a/src/components/metadataeditor/metadataeditor.js b/src/components/metadataeditor/metadataeditor.js index 030fdc80c..e8736258f 100644 --- a/src/components/metadataeditor/metadataeditor.js +++ b/src/components/metadataeditor/metadataeditor.js @@ -477,7 +477,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi html += '

'; if (formatString) { - html += ''; + html += ''; } html += '
'; @@ -917,7 +917,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi for (var i = 0; i < items.length; i++) { html += '
'; - html += 'live_tv'; + html += ''; html += '
'; diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js index 11f14fdc8..1ed220e06 100644 --- a/src/components/remotecontrol/remotecontrol.js +++ b/src/components/remotecontrol/remotecontrol.js @@ -266,7 +266,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL toggleRepeatButton.innerHTML = "repeat"; toggleRepeatButton.classList.add("repeatButton-active"); } else if ("RepeatOne" == repeatMode) { - toggleRepeatButton.innerHTML = "repeat_one"; + toggleRepeatButton.innerHTML = ""; toggleRepeatButton.classList.add("repeatButton-active"); } else { toggleRepeatButton.innerHTML = "repeat"; diff --git a/src/controllers/dashboard/notifications/notifications.js b/src/controllers/dashboard/notifications/notifications.js index 466728210..8f63753bf 100644 --- a/src/controllers/dashboard/notifications/notifications.js +++ b/src/controllers/dashboard/notifications/notifications.js @@ -31,14 +31,14 @@ define(["loading", "libraryMenu", "globalize", "listViewStyle", "emby-button"], } itemHtml += ''; if (notification.Enabled) { - itemHtml += 'notifications_active'; + itemHtml += ''; } else { - itemHtml += 'notifications_off'; + itemHtml += ''; } itemHtml += '
'; itemHtml += '
' + notification.Name + "
"; itemHtml += "
"; - itemHtml += ''; + itemHtml += ''; itemHtml += ""; return itemHtml; }).join(""); diff --git a/src/controllers/devices.js b/src/controllers/devices.js index 4ddb4d4d2..3fd2be983 100644 --- a/src/controllers/devices.js +++ b/src/controllers/devices.js @@ -80,7 +80,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu deviceHtml += '
"; deviceHtml += "
"; } else { - deviceHtml += 'tablet_android'; + deviceHtml += ''; } deviceHtml += ""; diff --git a/src/controllers/dlnaprofiles.js b/src/controllers/dlnaprofiles.js index eae529c53..e1719ea59 100644 --- a/src/controllers/dlnaprofiles.js +++ b/src/controllers/dlnaprofiles.js @@ -32,7 +32,7 @@ define(["jQuery", "globalize", "loading", "libraryMenu", "listViewStyle", "emby- for (var i = 0, length = profiles.length; i < length; i++) { var profile = profiles[i]; html += '
'; - html += 'live_tv'; + html += ''; html += '
'; html += ""; html += "
" + profile.Name + "
"; diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js index 1a9b9775e..b7cb4b5c5 100644 --- a/src/scripts/editorsidebar.js +++ b/src/scripts/editorsidebar.js @@ -49,7 +49,7 @@ define(["datetime", "jQuery", "material-icons"], function (datetime, $) { } else if (item.MediaType === "Audio") { htmlName += 'audiotrack'; } else if (item.Type === "TvChannel") { - htmlName += 'live_tv'; + htmlName += ''; } else if (item.MediaType === "Photo") { htmlName += 'photo'; } else if (item.MediaType === "Book") { diff --git a/src/scripts/librarybrowser.js b/src/scripts/librarybrowser.js index 4aab16b2e..bd8980aed 100644 --- a/src/scripts/librarybrowser.js +++ b/src/scripts/librarybrowser.js @@ -92,7 +92,7 @@ define(["userSettings"], function (userSettings) { if (showControls) { html += ''; - html += ''; + html += ''; } if (options.addLayoutButton) { diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js index 0abcf697b..a1ca198d5 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -205,7 +205,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " html += globalize.translate("HeaderAdmin"); html += ""; html += 'dashboard' + globalize.translate("TabDashboard") + ""; - html += 'mode_edit' + globalize.translate("Metadata") + ""; + html += '' + globalize.translate("Metadata") + ""; html += "
"; } @@ -219,7 +219,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " html += 'wifi' + globalize.translate("ButtonSelectServer") + ""; } - html += 'exit_to_app' + globalize.translate("ButtonSignOut") + ""; + html += '' + globalize.translate("ButtonSignOut") + ""; html += "
"; } From 25f3be7e7030b9b802091173cbd37a2df667349d Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Sun, 23 Feb 2020 01:47:17 +0300 Subject: [PATCH 2/4] move underscore Icon to class --- src/components/apphost.js | 2 +- src/components/guide/tvguide.template.html | 2 +- src/itemdetails.html | 4 ++-- src/mypreferencesmenu.html | 6 +++--- src/nowplaying.html | 4 ++-- src/wizardlibrary.html | 2 +- src/wizardremoteaccess.html | 2 +- src/wizardsettings.html | 2 +- src/wizardstart.html | 2 +- src/wizarduser.html | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/components/apphost.js b/src/components/apphost.js index 2a0b7b19e..22d61cc08 100644 --- a/src/components/apphost.js +++ b/src/components/apphost.js @@ -374,7 +374,7 @@ define(["appSettings", "browser", "events", "htmlMediaHelper"], function (appSet return -1 !== supportedFeatures.indexOf(command.toLowerCase()); }, preferVisualCards: browser.android || browser.chrome, - moreIcon: browser.android ? "dots-vert" : "dots-horiz", + moreIcon: browser.android ? "more_vert" : "more_horiz", getSyncProfile: getSyncProfile, getDefaultLayout: function () { if (window.NativeShell) { diff --git a/src/components/guide/tvguide.template.html b/src/components/guide/tvguide.template.html index 5dc16dba3..ef3c4b58c 100644 --- a/src/components/guide/tvguide.template.html +++ b/src/components/guide/tvguide.template.html @@ -33,6 +33,6 @@
diff --git a/src/itemdetails.html b/src/itemdetails.html index 100e3f968..ec3ada09d 100644 --- a/src/itemdetails.html +++ b/src/itemdetails.html @@ -31,7 +31,7 @@ @@ -94,7 +94,7 @@ diff --git a/src/mypreferencesmenu.html b/src/mypreferencesmenu.html index f7948a078..41fcd1b75 100644 --- a/src/mypreferencesmenu.html +++ b/src/mypreferencesmenu.html @@ -32,7 +32,7 @@
- play_circle_filled +
${TitlePlayback}
@@ -60,7 +60,7 @@
- mode_edit +
${Metadata}
@@ -79,7 +79,7 @@
- exit_to_app +
${ButtonSignOut}
diff --git a/src/nowplaying.html b/src/nowplaying.html index 690aa2f5f..b10624149 100644 --- a/src/nowplaying.html +++ b/src/nowplaying.html @@ -87,10 +87,10 @@

diff --git a/src/wizardlibrary.html b/src/wizardlibrary.html index 660b508f2..4fad65658 100644 --- a/src/wizardlibrary.html +++ b/src/wizardlibrary.html @@ -16,7 +16,7 @@
diff --git a/src/wizardremoteaccess.html b/src/wizardremoteaccess.html index 8a830d624..c7ddfb7e8 100644 --- a/src/wizardremoteaccess.html +++ b/src/wizardremoteaccess.html @@ -26,7 +26,7 @@
diff --git a/src/wizardsettings.html b/src/wizardsettings.html index 5850167c5..f75391947 100644 --- a/src/wizardsettings.html +++ b/src/wizardsettings.html @@ -21,7 +21,7 @@ diff --git a/src/wizardstart.html b/src/wizardstart.html index 5dd6f7e1b..a47fcad09 100644 --- a/src/wizardstart.html +++ b/src/wizardstart.html @@ -20,7 +20,7 @@
diff --git a/src/wizarduser.html b/src/wizarduser.html index 9f54d7ca6..90f492b0f 100644 --- a/src/wizarduser.html +++ b/src/wizarduser.html @@ -27,7 +27,7 @@ From de28101f660a6f953b5971938b840791de24c5bc Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Sun, 23 Feb 2020 02:32:44 +0300 Subject: [PATCH 3/4] Fix 2 speakers icons next to volume slider #841 --- src/components/playback/volumeosd.js | 2 +- src/videoosd.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/playback/volumeosd.js b/src/components/playback/volumeosd.js index de20aaab1..5d2c90ddb 100644 --- a/src/components/playback/volumeosd.js +++ b/src/components/playback/volumeosd.js @@ -11,7 +11,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia function getOsdElementHtml() { var html = ''; - html += ''; + html += ''; html += '
'; diff --git a/src/videoosd.html b/src/videoosd.html index ac3570c67..c200360c0 100644 --- a/src/videoosd.html +++ b/src/videoosd.html @@ -76,7 +76,7 @@
From b20bd4d4b96834a237eab2b9fa0165b2c0083aac Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Sun, 23 Feb 2020 02:40:08 +0300 Subject: [PATCH 4/4] Fix 2 speakers icons --- src/components/nowplayingbar/nowplayingbar.js | 2 +- src/nowplaying.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/nowplayingbar/nowplayingbar.js b/src/components/nowplayingbar/nowplayingbar.js index 9a96220e5..7d4cfaa34 100644 --- a/src/components/nowplayingbar/nowplayingbar.js +++ b/src/components/nowplayingbar/nowplayingbar.js @@ -54,7 +54,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', html += '
'; - html += ''; + html += ''; html += '
'; html += ''; diff --git a/src/nowplaying.html b/src/nowplaying.html index b10624149..c1d77bdc3 100644 --- a/src/nowplaying.html +++ b/src/nowplaying.html @@ -63,7 +63,7 @@