From d088f5ef05723aab209271e2352d11c04266cf18 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sat, 25 Apr 2020 10:00:20 +0300 Subject: [PATCH 1/6] Move icons into class --- src/apikeys.html | 2 +- src/components/actionsheet/actionsheet.js | 4 +- src/components/activitylog.js | 8 ++-- src/components/alphapicker/alphapicker.js | 2 +- src/components/cardbuilder/cardBuilder.js | 20 ++++----- src/components/channelmapper/channelmapper.js | 2 +- .../collectioneditor/collectioneditor.js | 2 +- .../directorybrowser/directorybrowser.js | 2 +- src/components/guide/guide.js | 2 +- src/components/imageeditor/imageeditor.js | 4 +- .../imageeditor/imageeditor.template.html | 12 +++--- .../imageuploader/imageuploader.template.html | 2 +- src/components/indicators/indicators.js | 8 ++-- src/components/itemcontextmenu.js | 4 +- src/components/listview/listview.js | 10 ++--- src/components/mediainfo/mediainfo.js | 2 +- .../medialibrarycreator.js | 2 +- .../medialibrarycreator.template.html | 2 +- .../medialibraryeditor/medialibraryeditor.js | 2 +- .../medialibraryeditor.template.html | 2 +- .../metadataeditor/metadataeditor.js | 6 +-- .../metadataeditor.template.html | 10 ++--- src/components/multiselect/multiselect.js | 6 +-- src/components/nowplayingbar/nowplayingbar.js | 41 ++++++++----------- src/components/playback/volumeosd.js | 6 ++- src/components/playerstats/playerstats.js | 2 +- src/components/remotecontrol/remotecontrol.js | 22 +++++----- .../search/searchfields.template.html | 2 +- .../subtitleeditor/subtitleeditor.js | 2 +- .../subtitleeditor.template.html | 4 +- .../subtitlesync/subtitlesync.template.html | 2 +- src/components/tabbedview/itemstab.js | 4 +- src/components/tunerpicker.js | 2 +- .../tvproviders/xmltv.template.html | 2 +- .../userdatabuttons/userdatabuttons.js | 2 +- src/controllers/auth/selectserver.js | 2 +- src/controllers/dashboard/dashboard.js | 20 ++++----- .../dashboard/plugins/available.js | 2 +- .../dashboard/plugins/installed.js | 2 +- .../dashboard/scheduledtasks/scheduledtask.js | 4 +- .../scheduledtasks/scheduledtasks.js | 2 +- src/controllers/dlnaprofile.js | 22 +++++----- src/controllers/dlnaprofiles.js | 2 +- src/controllers/itemdetailpage.js | 3 +- src/controllers/livetvstatus.js | 4 +- src/controllers/medialibrarypage.js | 4 +- src/controllers/playback/videoosd.js | 12 +++--- src/controllers/userparentalcontrol.js | 4 +- src/controllers/userprofilespage.js | 4 +- src/dashboardgeneral.html | 4 +- src/dlnaprofile.html | 4 +- src/dlnaprofiles.html | 2 +- src/elements/emby-checkbox/emby-checkbox.js | 4 +- .../emby-ratingbutton/emby-ratingbutton.js | 8 ++-- .../emby-scrollbuttons/emby-scrollbuttons.js | 4 +- src/encodingsettings.html | 4 +- src/itemdetails.html | 18 ++++---- src/list.html | 6 +-- src/livetvsettings.html | 8 ++-- src/livetvstatus.html | 4 +- src/livetvtuner.html | 2 +- src/movies.html | 2 +- src/music.html | 2 +- src/mypreferencesmenu.html | 10 ++--- src/networking.html | 2 +- src/nowplaying.html | 18 ++++---- src/scheduledtask.html | 2 +- src/scripts/editorsidebar.js | 12 +++--- src/scripts/librarymenu.js | 28 ++++++------- src/userparentalcontrol.html | 4 +- src/userprofiles.html | 2 +- src/videoosd.html | 14 +++---- src/wizardfinish.html | 2 +- src/wizardlibrary.html | 2 +- 74 files changed, 229 insertions(+), 233 deletions(-) diff --git a/src/apikeys.html b/src/apikeys.html index 6f766ae6c9..93c3e57ef6 100644 --- a/src/apikeys.html +++ b/src/apikeys.html @@ -4,7 +4,7 @@

${HeaderApiKeys}

${HeaderApiKeysHelp}

diff --git a/src/components/actionsheet/actionsheet.js b/src/components/actionsheet/actionsheet.js index 926d63b637..30e15ffeb7 100644 --- a/src/components/actionsheet/actionsheet.js +++ b/src/components/actionsheet/actionsheet.js @@ -226,9 +226,9 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu if (itemIcon) { - html += '' + itemIcon + ''; + html += ''; } else if (renderIcon && !center) { - html += ''; + html += ''; } html += '
'; diff --git a/src/components/activitylog.js b/src/components/activitylog.js index 62eda74d5f..1a8707c808 100644 --- a/src/components/activitylog.js +++ b/src/components/activitylog.js @@ -13,12 +13,12 @@ define(["events", "globalize", "dom", "date-fns", "dfnshelper", "userSettings", } if (entry.UserId && entry.UserPrimaryImageTag) { - html += 'dvr"; + }) + "');background-repeat:no-repeat;background-position:center center;background-size: cover;\">"; } else { - html += '' + icon + ''; + html += ''; } html += '
'; @@ -34,7 +34,7 @@ define(["events", "globalize", "dom", "date-fns", "dfnshelper", "userSettings", html += "
"; if (entry.Overview) { - html += ''; + html += ''; } return html += "
"; diff --git a/src/components/alphapicker/alphapicker.js b/src/components/alphapicker/alphapicker.js index 455a43b46d..577047fca4 100644 --- a/src/components/alphapicker/alphapicker.js +++ b/src/components/alphapicker/alphapicker.js @@ -77,7 +77,7 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b html += mapLetters(letters, vertical).join(''); if (options.mode === 'keyboard') { - html += ''; + html += ''; html += ''; letters = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']; diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index a4cf6edadc..70abd5e39d 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -1569,7 +1569,7 @@ import 'programStyles'; if (itemHelper.canMarkPlayed(item)) { require(['emby-playstatebutton']); - html += ''; + html += ''; } if (itemHelper.canRate(item)) { @@ -1577,7 +1577,7 @@ import 'programStyles'; const likes = userData.Likes == null ? '' : userData.Likes; require(['emby-ratingbutton']); - html += ''; + html += ''; } html += ''; @@ -1601,22 +1601,22 @@ import 'programStyles'; switch (item.Type) { case 'MusicAlbum': - return 'album'; + return ''; case 'MusicArtist': case 'Person': - return 'person'; + return ''; case 'Movie': - return 'movie'; + return ''; case 'Series': - return 'tv'; + return ''; case 'Book': - return 'book'; + return ''; case 'Folder': - return 'folder'; + return ''; } if (options && options.defaultCardImageIcon) { - return '' + options.defaultCardImageIcon + ''; + return ''; } const defaultName = isUsingLiveTvNaming(item) ? item.Name : itemHelper.getDisplayName(item); @@ -1718,7 +1718,7 @@ import 'programStyles'; indicatorsElem = ensureIndicators(card, indicatorsElem); indicatorsElem.appendChild(playedIndicator); } - playedIndicator.innerHTML = 'check'; + playedIndicator.innerHTML = ''; } else { playedIndicator = card.querySelector('.playedIndicator'); diff --git a/src/components/channelmapper/channelmapper.js b/src/components/channelmapper/channelmapper.js index 2ea7a3a13a..f7b3a101e9 100644 --- a/src/components/channelmapper/channelmapper.js +++ b/src/components/channelmapper/channelmapper.js @@ -60,7 +60,7 @@ define(["dom", "dialogHelper", "loading", "connectionManager", "globalize", "act function getTunerChannelHtml(channel, providerName) { var html = ""; html += '
'; - html += 'dvr'; + html += ''; html += '
'; html += '

'; html += channel.Name; diff --git a/src/components/collectioneditor/collectioneditor.js b/src/components/collectioneditor/collectioneditor.js index 49784df498..7a14c3666c 100644 --- a/src/components/collectioneditor/collectioneditor.js +++ b/src/components/collectioneditor/collectioneditor.js @@ -236,7 +236,7 @@ define(['dom', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectio html += '

'; if (appHost.supports('externallinks')) { - html += 'info' + globalize.translate('Help') + ''; + html += '' + globalize.translate('Help') + ''; } html += '
'; diff --git a/src/components/directorybrowser/directorybrowser.js b/src/components/directorybrowser/directorybrowser.js index fc976068e7..cd84dcb28d 100644 --- a/src/components/directorybrowser/directorybrowser.js +++ b/src/components/directorybrowser/directorybrowser.js @@ -116,7 +116,7 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper- html += ''; html += "
"; if (!readOnlyAttribute) { - html += ''; + html += ''; } html += ""; if (!readOnlyAttribute) { diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js index d6497e5f09..91ed83487a 100644 --- a/src/components/guide/guide.js +++ b/src/components/guide/guide.js @@ -577,7 +577,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', html += ''; if (program.IsHD && options.showHdIcon) { - //html += 'hd'; + //html += ''; if (layoutManager.tv) { html += '
HD
'; } else { diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js index 20aebf4305..b2c3ecc19f 100644 --- a/src/components/imageeditor/imageeditor.js +++ b/src/components/imageeditor/imageeditor.js @@ -167,11 +167,11 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', } } else { if (imageProviders.length) { - html += ''; + html += ''; } } - html += ''; + html += ''; html += ''; } diff --git a/src/components/imageeditor/imageeditor.template.html b/src/components/imageeditor/imageeditor.template.html index 37dce874c0..92a05ec062 100644 --- a/src/components/imageeditor/imageeditor.template.html +++ b/src/components/imageeditor/imageeditor.template.html @@ -12,10 +12,10 @@

${Images}

@@ -27,10 +27,10 @@

${Backdrops}

@@ -42,10 +42,10 @@

${Screenshots}

diff --git a/src/components/imageuploader/imageuploader.template.html b/src/components/imageuploader/imageuploader.template.html index 1b83b50955..0e2d884d5f 100644 --- a/src/components/imageuploader/imageuploader.template.html +++ b/src/components/imageuploader/imageuploader.template.html @@ -14,7 +14,7 @@

${HeaderAddUpdateImage}

diff --git a/src/components/indicators/indicators.js b/src/components/indicators/indicators.js index 633706d209..90520653c4 100644 --- a/src/components/indicators/indicators.js +++ b/src/components/indicators/indicators.js @@ -90,7 +90,7 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm } if (userData.PlayedPercentage && userData.PlayedPercentage >= 100 || (userData.Played)) { - return '
check
'; + return '
'; } } @@ -150,16 +150,16 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm function getTypeIndicator(item) { if (item.Type === 'Video') { - return '
videocam
'; + return '
'; } if (item.Type === 'Folder') { - return '
folder
'; + return '
'; } if (item.Type === 'PhotoAlbum') { return '
'; } if (item.Type === 'Photo') { - return '
photo
'; + return '
'; } return ''; diff --git a/src/components/itemcontextmenu.js b/src/components/itemcontextmenu.js index 5f95714d36..5b5f948bcc 100644 --- a/src/components/itemcontextmenu.js +++ b/src/components/itemcontextmenu.js @@ -15,7 +15,7 @@ define(["apphost", "globalize", "connectionManager", "itemHelper", "appRouter", commands.push({ name: globalize.translate("Play"), id: "resume", - icon: "" + icon: "play_arrow" }); } @@ -23,7 +23,7 @@ define(["apphost", "globalize", "connectionManager", "itemHelper", "appRouter", commands.push({ name: globalize.translate("PlayAllFromHere"), id: "playallfromhere", - icon: "" + icon: "play_arrow" }); } } diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js index 532ba094a8..99551245df 100644 --- a/src/components/listview/listview.js +++ b/src/components/listview/listview.js @@ -160,7 +160,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan var button = options.rightButtons[i]; - html += ''; + html += ''; } return html; @@ -426,7 +426,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan html += '
'; - var moreIcon = ''; + const moreIcon = 'more_horiz'; html += getTextLinesHtml(textlines, isLargeStyle); @@ -479,7 +479,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan } if (options.moreButton !== false) { - html += ''; + html += ''; } if (options.infoButton) { @@ -496,11 +496,11 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan var likes = userData.Likes == null ? '' : userData.Likes; if (itemHelper.canMarkPlayed(item)) { - html += ''; + html += ''; } if (itemHelper.canRate(item)) { - html += ''; + html += ''; } } } diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js index 188ea9a07c..e2b7dfb353 100644 --- a/src/components/mediainfo/mediainfo.js +++ b/src/components/mediainfo/mediainfo.js @@ -390,7 +390,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater if (item.CommunityRating) { html += '
'; - html += 'star'; + html += ''; html += item.CommunityRating.toFixed(1); html += '
'; } diff --git a/src/components/medialibrarycreator/medialibrarycreator.js b/src/components/medialibrarycreator/medialibrarycreator.js index 0a8741387f..120e72bcfe 100644 --- a/src/components/medialibrarycreator/medialibrarycreator.js +++ b/src/components/medialibrarycreator/medialibrarycreator.js @@ -116,7 +116,7 @@ define(["loading", "dialogHelper", "dom", "jQuery", "components/libraryoptionsed } html += "
"; - html += ''; + html += ''; html += "
"; return html; } diff --git a/src/components/medialibrarycreator/medialibrarycreator.template.html b/src/components/medialibrarycreator/medialibrarycreator.template.html index 32c6b254b7..fe701b8c8c 100644 --- a/src/components/medialibrarycreator/medialibrarycreator.template.html +++ b/src/components/medialibrarycreator/medialibrarycreator.template.html @@ -26,7 +26,7 @@

${HeadersFolders}

diff --git a/src/components/medialibraryeditor/medialibraryeditor.js b/src/components/medialibraryeditor/medialibraryeditor.js index 7c5c8d4080..7bf2453a6f 100644 --- a/src/components/medialibraryeditor/medialibraryeditor.js +++ b/src/components/medialibraryeditor/medialibraryeditor.js @@ -107,7 +107,7 @@ define(["jQuery", "loading", "dialogHelper", "dom", "components/libraryoptionsed } html += "
"; - html += ''; + html += ''; html += ""; return html; } diff --git a/src/components/medialibraryeditor/medialibraryeditor.template.html b/src/components/medialibraryeditor/medialibraryeditor.template.html index 172c535fa1..faa15afe9f 100644 --- a/src/components/medialibraryeditor/medialibraryeditor.template.html +++ b/src/components/medialibraryeditor/medialibraryeditor.template.html @@ -20,7 +20,7 @@

${HeadersFolders}

diff --git a/src/components/metadataeditor/metadataeditor.js b/src/components/metadataeditor/metadataeditor.js index 8a64cac7ef..2ee4248aa9 100644 --- a/src/components/metadataeditor/metadataeditor.js +++ b/src/components/metadataeditor/metadataeditor.js @@ -932,7 +932,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi html += ''; - html += ''; + html += ''; html += ''; } @@ -953,7 +953,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi html += '
'; - html += 'person'; + html += ''; html += '
'; html += ''; html += '
'; - html += ''; + html += ''; html += '
'; } diff --git a/src/components/metadataeditor/metadataeditor.template.html b/src/components/metadataeditor/metadataeditor.template.html index 8e36a824b7..87a929fa20 100644 --- a/src/components/metadataeditor/metadataeditor.template.html +++ b/src/components/metadataeditor/metadataeditor.template.html @@ -5,7 +5,7 @@
@@ -193,7 +193,7 @@ ${People}
@@ -203,7 +203,7 @@ ${Studios}
@@ -212,7 +212,7 @@ ${Tags}
diff --git a/src/components/multiselect/multiselect.js b/src/components/multiselect/multiselect.js index b4fa87c8a0..89550135b5 100644 --- a/src/components/multiselect/multiselect.js +++ b/src/components/multiselect/multiselect.js @@ -126,11 +126,11 @@ define(["browser", "appStorage", "apphost", "loading", "connectionManager", "glo var html = ""; - html += ''; + html += ''; html += '

'; - var moreIcon = ""; - html += ''; + const moreIcon = "more_horiz"; + html += ''; selectionCommandsPanel.innerHTML = html; diff --git a/src/components/nowplayingbar/nowplayingbar.js b/src/components/nowplayingbar/nowplayingbar.js index a3839a9342..b248a260ab 100644 --- a/src/components/nowplayingbar/nowplayingbar.js +++ b/src/components/nowplayingbar/nowplayingbar.js @@ -44,9 +44,9 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', html += ''; - html += ''; + html += ''; - html += ''; + html += ''; html += ''; html += '
'; @@ -54,18 +54,18 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', html += '
'; - html += ''; + html += ''; html += '
'; html += ''; html += '
'; - html += ''; + html += ''; html += '
'; html += '
'; - html += ''; + html += ''; html += ''; html += '
'; @@ -285,17 +285,11 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', var length; if (playPauseButtons) { - if (isPaused) { + let icons = ["play_arrow", "pause"]; + if (isPaused) icons = icons.reverse(); - for (i = 0, length = playPauseButtons.length; i < length; i++) { - playPauseButtons[i].querySelector('i').innerHTML = ''; - } - - } else { - - for (i = 0, length = playPauseButtons.length; i < length; i++) { - playPauseButtons[i].querySelector('i').innerHTML = 'pause'; - } + for (i = 0, length = playPauseButtons.length; i < length; i++) { + playPauseButtons[i].querySelector('i').classList.replace(icons[0], icons[1]); } } } @@ -340,15 +334,16 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', } function updateRepeatModeDisplay(repeatMode) { + toggleRepeatButtonIcon.classList.remove("repeat", "repeat_one"); if (repeatMode === 'RepeatAll') { - toggleRepeatButtonIcon.innerHTML = "repeat"; + toggleRepeatButtonIcon.classList.add("repeat"); toggleRepeatButton.classList.add('repeatButton-active'); } else if (repeatMode === 'RepeatOne') { - toggleRepeatButtonIcon.innerHTML = "repeat_one"; + toggleRepeatButtonIcon.classList.add("repeat_one"); toggleRepeatButton.classList.add('repeatButton-active'); } else { - toggleRepeatButtonIcon.innerHTML = "repeat"; + toggleRepeatButtonIcon.classList.add("repeat"); toggleRepeatButton.classList.remove('repeatButton-active'); } } @@ -397,11 +392,9 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', showMuteButton = false; } - if (isMuted) { - muteButton.querySelector('i').innerHTML = ''; - } else { - muteButton.querySelector('i').innerHTML = ''; - } + let icons = ["volume_off", "volume_up"]; + if (isMuted) icons = icons.reverse(); + muteButton.querySelector('i').classList.replace(icons[0], icons[1]); if (supportedCommands.indexOf('SetVolume') === -1) { showVolumeSlider = false; @@ -564,7 +557,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', queue: false, positionTo: contextButton }; - nowPlayingUserData.innerHTML = ''; + nowPlayingUserData.innerHTML = ''; apiClient.getCurrentUser().then(function(user) { contextButton.addEventListener('click', function () { itemContextMenu.show(Object.assign({ diff --git a/src/components/playback/volumeosd.js b/src/components/playback/volumeosd.js index 5d2c90ddb7..1a0c566e55 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 += '
'; @@ -101,7 +101,9 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia function updatePlayerVolumeState(isMuted, volume) { if (iconElement) { - iconElement.innerHTML = isMuted ? '' : ''; + let icons = ["volume_off", "volume_up"]; + if (isMuted) icons = icons.reverse(); + iconElement.classList.replace(icons[0], icons[1]); } if (progressElement) { progressElement.style.width = (volume || 0) + '%'; diff --git a/src/components/playerstats/playerstats.js b/src/components/playerstats/playerstats.js index 89adf22624..572f653fc6 100644 --- a/src/components/playerstats/playerstats.js +++ b/src/components/playerstats/playerstats.js @@ -18,7 +18,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'playMeth if (layoutManager.tv) { button = ''; } else { - button = ''; + button = ''; } var contentClass = layoutManager.tv ? 'playerStats-content playerStats-content-tv' : 'playerStats-content'; diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js index 8e2a382d1d..6b7a7d7738 100644 --- a/src/components/remotecontrol/remotecontrol.js +++ b/src/components/remotecontrol/remotecontrol.js @@ -171,8 +171,8 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) { var userData = fullItem.UserData || {}; var likes = null == userData.Likes ? "" : userData.Likes; - context.querySelector(".nowPlayingPageUserDataButtonsTitle").innerHTML = ''; - context.querySelector(".nowPlayingPageUserDataButtons").innerHTML = ''; + context.querySelector(".nowPlayingPageUserDataButtonsTitle").innerHTML = ''; + context.querySelector(".nowPlayingPageUserDataButtons").innerHTML = ''; }); } else { backdrop.clear(); @@ -196,7 +196,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL context.querySelector(".nowPlayingPageImage").classList.remove("nowPlayingPageImageAudio"); } } else { - imgContainer.innerHTML = '
'; + imgContainer.innerHTML = '
'; } } @@ -319,13 +319,13 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL var toggleRepeatButton = context.querySelector(".repeatToggleButton"); if ("RepeatAll" == repeatMode) { - toggleRepeatButton.innerHTML = "repeat"; + toggleRepeatButton.innerHTML = ""; toggleRepeatButton.classList.add("repeatButton-active"); } else if ("RepeatOne" == repeatMode) { toggleRepeatButton.innerHTML = ""; toggleRepeatButton.classList.add("repeatButton-active"); } else { - toggleRepeatButton.innerHTML = "repeat"; + toggleRepeatButton.innerHTML = ""; toggleRepeatButton.classList.remove("repeatButton-active"); } } @@ -351,10 +351,10 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL if (isMuted) { view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Unmute")); - view.querySelector(".buttonMute i").innerHTML = ""; + view.querySelector(".buttonMute i").classList.replace("volume_up", "volume_off"); } else { view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Mute")); - view.querySelector(".buttonMute i").innerHTML = ""; + view.querySelector(".buttonMute i").classList.replace("volume_off", "volume_up"); } if (showMuteButton) { @@ -382,7 +382,9 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL function updatePlayPauseState(isPaused, isActive) { var context = dlg; var btnPlayPause = context.querySelector(".btnPlayPause"); - btnPlayPause.querySelector("i").innerHTML = isPaused ? "" : ""; + let icons = ["play_circle_filled", "pause_circle_filled"]; + if (isPaused) icons = icons.reverse(); + btnPlayPause.querySelector("i").classList.replace(icons[0], icons[1]); buttonVisible(btnPlayPause, isActive); } @@ -417,7 +419,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL action: "setplaylistindex", enableUserDataButtons: false, rightButtons: [{ - icon: "", + icon: "remove_circle_outline", title: globalize.translate("ButtonRemove"), id: "remove" }], @@ -674,7 +676,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL var contextmenuHtml = ''; var volumecontrolHtml = '
'; - volumecontrolHtml += ''; + volumecontrolHtml += ''; volumecontrolHtml += '
'; volumecontrolHtml += '
'; if (!layoutManager.mobile) { diff --git a/src/components/search/searchfields.template.html b/src/components/search/searchfields.template.html index c1e9c64347..40b916882d 100644 --- a/src/components/search/searchfields.template.html +++ b/src/components/search/searchfields.template.html @@ -1,5 +1,5 @@
- search +
diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js index 1ff30712f6..ea1bee4f3e 100644 --- a/src/components/subtitleeditor/subtitleeditor.js +++ b/src/components/subtitleeditor/subtitleeditor.js @@ -149,7 +149,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings', if (!layoutManager.tv) { if (s.Path) { - itemHtml += ''; + itemHtml += ''; } } diff --git a/src/components/subtitleeditor/subtitleeditor.template.html b/src/components/subtitleeditor/subtitleeditor.template.html index 8719cc9305..57d83d618c 100644 --- a/src/components/subtitleeditor/subtitleeditor.template.html +++ b/src/components/subtitleeditor/subtitleeditor.template.html @@ -2,7 +2,7 @@

${Subtitles}

- info${Help} + ${Help}
@@ -18,7 +18,7 @@
- +
diff --git a/src/components/subtitlesync/subtitlesync.template.html b/src/components/subtitlesync/subtitlesync.template.html index 999e4d0bb9..eaf4a2993b 100644 --- a/src/components/subtitlesync/subtitlesync.template.html +++ b/src/components/subtitlesync/subtitlesync.template.html @@ -1,5 +1,5 @@
- +
0s
diff --git a/src/components/tabbedview/itemstab.js b/src/components/tabbedview/itemstab.js index 6cfd408424..26da63c894 100644 --- a/src/components/tabbedview/itemstab.js +++ b/src/components/tabbedview/itemstab.js @@ -181,7 +181,9 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts return; } - btnSortIcon.innerHTML = values.sortOrder === 'Descending' ? '' : ''; + let icons = ["arrow_downward", "arrow_upward"]; + if (values.sortOrder === 'Descending') icons = icons.reverse(); + btnSortIcon.classList.replace(icons[0], icons[1]); } function bindAll(elems, eventName, fn) { diff --git a/src/components/tunerpicker.js b/src/components/tunerpicker.js index 4dd5ecd3de..bd4484abe0 100644 --- a/src/components/tunerpicker.js +++ b/src/components/tunerpicker.js @@ -41,7 +41,7 @@ define(["dialogHelper", "dom", "layoutManager", "connectionManager", "globalize" html += '
'; html += '
'; html += '
'; - html += '
dvr
'; + html += '
'; html += "
"; html += "
"; html += '
'; diff --git a/src/components/tvproviders/xmltv.template.html b/src/components/tvproviders/xmltv.template.html index 7f6490e621..f48bfb3857 100644 --- a/src/components/tvproviders/xmltv.template.html +++ b/src/components/tvproviders/xmltv.template.html @@ -12,7 +12,7 @@
- +
${XmlTvPathHelp}
diff --git a/src/components/userdatabuttons/userdatabuttons.js b/src/components/userdatabuttons/userdatabuttons.js index 2636be1e1d..1c1d794080 100644 --- a/src/components/userdatabuttons/userdatabuttons.js +++ b/src/components/userdatabuttons/userdatabuttons.js @@ -30,7 +30,7 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto iconCssClass += 'material-icons'; - return ''; + return ''; } function onContainerClick(e) { diff --git a/src/controllers/auth/selectserver.js b/src/controllers/auth/selectserver.js index 2d27742119..91eebf8cee 100644 --- a/src/controllers/auth/selectserver.js +++ b/src/controllers/auth/selectserver.js @@ -18,7 +18,7 @@ define(["loading", "appRouter", "layoutManager", "appSettings", "apphost", "focu var cardImageContainer; if (item.showIcon) { - cardImageContainer = '' + item.icon + ""; + cardImageContainer = ''; } else { cardImageContainer = '
'; } diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js index 78f5cdca01..7246b4871f 100644 --- a/src/controllers/dashboard/dashboard.js +++ b/src/controllers/dashboard/dashboard.js @@ -303,16 +303,16 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa html += '
'; var btnCssClass = session.ServerId && session.NowPlayingItem && session.SupportsRemoteControl ? "" : " hide"; - var playIcon = session.PlayState.IsPaused ? 'pause' : 'play'; + const playIcon = session.PlayState.IsPaused ? 'pause' : 'play_arrow'; - html += ''; - html += ''; + html += ''; + html += ''; btnCssClass = session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length ? "" : " hide"; - html += ''; + html += ''; btnCssClass = session.ServerId && -1 !== session.SupportedCommands.indexOf("DisplayMessage") && session.DeviceId !== connectionManager.deviceId() ? "" : " hide"; - html += ''; + html += ''; html += "
"; html += '
'; @@ -368,7 +368,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa html += progress + "%"; html += ""; html += "" + progress + "%"; - html += ''; + html += ''; } else if (task.State === "Cancelling") { html += '' + globalize.translate("LabelStopping") + ""; } @@ -571,11 +571,9 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa row.querySelector(".btnSessionStop").classList.add("hide"); } - if (session.PlayState && session.PlayState.IsPaused) { - btnSessionPlayPause.querySelector("i").innerHTML = ""; - } else { - btnSessionPlayPause.querySelector("i").innerHTML = "pause"; - } + let icons = ["play_arrow", "pause"]; + if (session.PlayState && session.PlayState.IsPaused) icons = icons.reverse(); + btnSessionPlayPause.querySelector("i").classList.replace(icons[0], icons[1]); row.querySelector(".sessionNowPlayingStreamInfo").innerHTML = DashboardPage.getSessionNowPlayingStreamInfo(session); row.querySelector(".sessionNowPlayingTime").innerHTML = DashboardPage.getSessionNowPlayingTime(session); diff --git a/src/controllers/dashboard/plugins/available.js b/src/controllers/dashboard/plugins/available.js index adccfa3935..54440aa85c 100644 --- a/src/controllers/dashboard/plugins/available.js +++ b/src/controllers/dashboard/plugins/available.js @@ -103,7 +103,7 @@ define(["loading", "libraryMenu", "globalize", "cardStyle", "emby-button", "emby html += '
"; html += "
"; } else { - html += 'folder'; + html += ''; } html += ""; diff --git a/src/controllers/dashboard/plugins/installed.js b/src/controllers/dashboard/plugins/installed.js index c381b2409e..a326e24777 100644 --- a/src/controllers/dashboard/plugins/installed.js +++ b/src/controllers/dashboard/plugins/installed.js @@ -47,7 +47,7 @@ define(["loading", "libraryMenu", "dom", "globalize", "cardStyle", "emby-button" html += '
"; html += "
"; } else { - html += 'folder'; + html += ''; } html += configPageUrl ? "" : "
"; diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtask.js b/src/controllers/dashboard/scheduledtasks/scheduledtask.js index 8a3cdf5d69..aa56b0bc1a 100644 --- a/src/controllers/dashboard/scheduledtasks/scheduledtask.js +++ b/src/controllers/dashboard/scheduledtasks/scheduledtask.js @@ -49,7 +49,7 @@ define(["jQuery", "loading", "datetime", "dom", "globalize", "emby-input", "emby var trigger = task.Triggers[i]; html += '
'; - html += 'schedule'; + html += ''; if (trigger.MaxRuntimeMs) { html += '
'; } else { @@ -68,7 +68,7 @@ define(["jQuery", "loading", "datetime", "dom", "globalize", "emby-input", "emby } html += "
"; - html += ''; + html += ''; html += "
"; } diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js index b9c7ba413c..d70a49dba3 100644 --- a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js +++ b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js @@ -40,7 +40,7 @@ define(["jQuery", "loading", "events", "globalize", "serverNotifications", "date } html += '
'; html += ""; - html += 'schedule'; + html += ''; html += ""; html += '
'; html += ""; diff --git a/src/controllers/dlnaprofile.js b/src/controllers/dlnaprofile.js index ca0d3afdb1..06c3be74cc 100644 --- a/src/controllers/dlnaprofile.js +++ b/src/controllers/dlnaprofile.js @@ -76,12 +76,12 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in var index = 0; var html = '
' + headers.map(function (h) { var li = '
'; - li += 'info'; + li += ''; li += '
'; li += '

' + h.Name + ": " + (h.Value || "") + "

"; li += '
' + (h.Match || "") + "
"; li += "
"; - li += ''; + li += ''; li += "
"; index++; return li; @@ -132,11 +132,11 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in function renderXmlDocumentAttributes(page, attribute) { var html = '
' + attribute.map(function (h) { var li = '
'; - li += 'info'; + li += ''; li += '
'; li += '

' + h.Name + " = " + (h.Value || "") + "

"; li += "
"; - li += ''; + li += ''; return li += "
"; }).join("") + "
"; var elem = $(".xmlDocumentAttributeList", page).html(html).trigger("create"); @@ -174,11 +174,11 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in var index = 0; var html = '
' + profiles.map(function (h) { var li = '
'; - li += 'info'; + li += ''; li += '
'; li += '

' + (h.Format || "") + "

"; li += "
"; - li += ''; + li += ''; li += "
"; index++; return li; @@ -270,7 +270,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += ''; + html += ''; html += "
"; } @@ -331,7 +331,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += ''; + html += ''; html += "
"; } @@ -415,7 +415,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += ''; + html += ''; html += "
"; } @@ -487,7 +487,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += ''; + html += ''; html += "
"; } @@ -567,7 +567,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += ''; + html += ''; html += "
"; } diff --git a/src/controllers/dlnaprofiles.js b/src/controllers/dlnaprofiles.js index e1719ea597..544ab0d450 100644 --- a/src/controllers/dlnaprofiles.js +++ b/src/controllers/dlnaprofiles.js @@ -40,7 +40,7 @@ define(["jQuery", "globalize", "loading", "libraryMenu", "listViewStyle", "emby- html += ""; if ("User" == profile.Type) { - html += ''; + html += ''; } html += ""; diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js index e9242c5119..6347aa3802 100644 --- a/src/controllers/itemdetailpage.js +++ b/src/controllers/itemdetailpage.js @@ -1749,7 +1749,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti html += '

'; html += "" + type.name + ""; html += "

"; - html += ''; + html += ''; html += ""; html += '
'; var shape = "MusicAlbum" == type.type ? getSquareShape(false) : getPortraitShape(false); @@ -2078,7 +2078,6 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti bindAll(view, ".btnCancelTimer", "click", onCancelTimerClick); bindAll(view, ".btnDeleteItem", "click", onDeleteClick); bindAll(view, ".btnDownload", "click", onDownloadClick); - view.querySelector(".btnMoreCommands i").innerHTML = ""; view.querySelector(".trackSelections").addEventListener("submit", onTrackSelectionsSubmit); view.querySelector(".btnSplitVersions").addEventListener("click", function () { splitVersions(self, view, apiClient, params); diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js index aee5876a45..7a8b499217 100644 --- a/src/controllers/livetvstatus.js +++ b/src/controllers/livetvstatus.js @@ -26,7 +26,7 @@ define(["jQuery", "globalize", "scripts/taskbutton", "dom", "libraryMenu", "layo html += '
'; html += '
'; html += '
'; - html += '
dvr
'; + html += '
'; html += "
"; html += "
"; html += '
'; @@ -101,7 +101,7 @@ define(["jQuery", "globalize", "scripts/taskbutton", "dom", "libraryMenu", "layo for (var i = 0, length = providers.length; i < length; i++) { var provider = providers[i]; html += '
'; - html += 'dvr'; + html += ''; html += '
'; html += ''; html += '

'; diff --git a/src/controllers/medialibrarypage.js b/src/controllers/medialibrarypage.js index d838c2145e..956e6e0d9e 100644 --- a/src/controllers/medialibrarypage.js +++ b/src/controllers/medialibrarypage.js @@ -268,7 +268,7 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl hasCardImageContainer = true; } else if (!virtualFolder.showNameWithIcon) { html += '
'; - html += '' + (virtualFolder.icon || imageHelper.getLibraryIcon(virtualFolder.CollectionType)) + ""; + html += ''; hasCardImageContainer = true; } @@ -281,7 +281,7 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl if (!imgUrl && virtualFolder.showNameWithIcon) { html += '

'; - html += '' + (virtualFolder.icon || imageHelper.getLibraryIcon(virtualFolder.CollectionType)) + ""; + html += ''; if (virtualFolder.showNameWithIcon) { html += '
'; diff --git a/src/controllers/playback/videoosd.js b/src/controllers/playback/videoosd.js index 555e34c5b0..150f357b77 100644 --- a/src/controllers/playback/videoosd.js +++ b/src/controllers/playback/videoosd.js @@ -545,10 +545,10 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med function updateFullscreenIcon() { if (playbackManager.isFullscreen(currentPlayer)) { view.querySelector(".btnFullscreen").setAttribute("title", globalize.translate("ExitFullscreen")); - view.querySelector(".btnFullscreen i").innerHTML = ""; + view.querySelector(".btnFullscreen i").classList.replace("fullscreen", "fullscreen_exit"); } else { view.querySelector(".btnFullscreen").setAttribute("title", globalize.translate("Fullscreen") + " (f)"); - view.querySelector(".btnFullscreen i").innerHTML = "fullscreen"; + view.querySelector(".btnFullscreen i").classList.replace("fullscreen_exit", "fullscreen"); } } @@ -748,10 +748,10 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med function updatePlayPauseState(isPaused) { var button = view.querySelector(".btnPause i"); if (isPaused) { - button.innerHTML = ""; + button.classList.replace("pause", "play_arrow"); button.setAttribute("title", globalize.translate("ButtonPlay") + " (k)"); } else { - button.innerHTML = "pause"; + button.classList.replace("play_arrow", "pause"); button.setAttribute("title", globalize.translate("ButtonPause") + " (k)"); } } @@ -885,10 +885,10 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med if (isMuted) { view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Unmute") + " (m)"); - view.querySelector(".buttonMute i").innerHTML = ""; + view.querySelector(".buttonMute i").classList.replace("volume_up", "volume_off"); } else { view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Mute") + " (m)"); - view.querySelector(".buttonMute i").innerHTML = ""; + view.querySelector(".buttonMute i").classList.replace("volume_off", "volume_up"); } if (showMuteButton) { diff --git a/src/controllers/userparentalcontrol.js b/src/controllers/userparentalcontrol.js index 333c09f266..e3f1705ef5 100644 --- a/src/controllers/userparentalcontrol.js +++ b/src/controllers/userparentalcontrol.js @@ -108,7 +108,7 @@ define(["jQuery", "datetime", "loading", "libraryMenu", "listViewStyle", "paper- li += h; li += "

"; li += "
"; - li += ''; + li += ''; return li += "

"; }).join(""); @@ -143,7 +143,7 @@ define(["jQuery", "datetime", "loading", "libraryMenu", "listViewStyle", "paper- itemHtml += ""; itemHtml += '
' + getDisplayTime(a.StartHour) + " - " + getDisplayTime(a.EndHour) + "
"; itemHtml += "
"; - itemHtml += ''; + itemHtml += ''; itemHtml += "
"; index++; return itemHtml; diff --git a/src/controllers/userprofilespage.js b/src/controllers/userprofilespage.js index 180d0e62ae..b8dbc4fa60 100644 --- a/src/controllers/userprofilespage.js +++ b/src/controllers/userprofilespage.js @@ -104,7 +104,7 @@ define(["loading", "dom", "globalize", "date-fns", "dfnshelper", "paper-icon-but html += '
"; } else { html += '
'; - html += 'person'; + html += ''; } html += "
"; @@ -182,7 +182,7 @@ define(["loading", "dom", "globalize", "date-fns", "dfnshelper", "paper-icon-but html += '
"; html += "
"; } else { - html += 'person'; + html += ''; } html += ""; diff --git a/src/dashboardgeneral.html b/src/dashboardgeneral.html index d0ef17385f..f850783f13 100644 --- a/src/dashboardgeneral.html +++ b/src/dashboardgeneral.html @@ -39,7 +39,7 @@
- +
${LabelCachePathHelp}
@@ -49,7 +49,7 @@
- +
${LabelMetadataPathHelp}
diff --git a/src/dlnaprofile.html b/src/dlnaprofile.html index 2420ab4c35..4a5629fd8c 100644 --- a/src/dlnaprofile.html +++ b/src/dlnaprofile.html @@ -98,7 +98,7 @@

${HeaderHttpHeaders}

@@ -221,7 +221,7 @@

${HeaderXmlDocumentAttributes}

diff --git a/src/dlnaprofiles.html b/src/dlnaprofiles.html index c1ae38609c..764ac8e04d 100644 --- a/src/dlnaprofiles.html +++ b/src/dlnaprofiles.html @@ -9,7 +9,7 @@

${HeaderCustomDlnaProfiles}

- add + ${Help}
diff --git a/src/elements/emby-checkbox/emby-checkbox.js b/src/elements/emby-checkbox/emby-checkbox.js index b5e587d5a6..8067d33a74 100644 --- a/src/elements/emby-checkbox/emby-checkbox.js +++ b/src/elements/emby-checkbox/emby-checkbox.js @@ -57,8 +57,8 @@ define(['browser', 'dom', 'css!./emby-checkbox', 'registerElement'], function (b var checkedIcon = this.getAttribute('data-checkedicon') || 'check'; var uncheckedIcon = this.getAttribute('data-uncheckedicon') || ''; - var checkHtml = '' + checkedIcon + ''; - var uncheckedHtml = '' + uncheckedIcon + ''; + var checkHtml = ''; + var uncheckedHtml = ''; labelElement.insertAdjacentHTML('beforeend', '' + checkHtml + uncheckedHtml + ''); labelTextElement.classList.add('checkboxLabel'); diff --git a/src/elements/emby-ratingbutton/emby-ratingbutton.js b/src/elements/emby-ratingbutton/emby-ratingbutton.js index 84ae780de5..86c31ac871 100644 --- a/src/elements/emby-ratingbutton/emby-ratingbutton.js +++ b/src/elements/emby-ratingbutton/emby-ratingbutton.js @@ -62,7 +62,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby if (isFavorite) { if (icon) { - icon.innerHTML = 'favorite'; + icon.classList.add('favorite'); icon.classList.add('ratingbutton-icon-withrating'); } @@ -71,7 +71,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby } else if (likes) { if (icon) { - icon.innerHTML = 'favorite'; + icon.classList.add('favorite'); icon.classList.remove('ratingbutton-icon-withrating'); //icon.innerHTML = 'thumb_up'; } @@ -80,7 +80,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby } else if (likes === false) { if (icon) { - icon.innerHTML = 'favorite'; + icon.classList.add('favorite'); icon.classList.remove('ratingbutton-icon-withrating'); //icon.innerHTML = 'thumb_down'; } @@ -89,7 +89,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby } else { if (icon) { - icon.innerHTML = 'favorite'; + icon.classList.add('favorite'); icon.classList.remove('ratingbutton-icon-withrating'); //icon.innerHTML = 'thumbs_up_down'; } diff --git a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js index af8261a632..229771b8ed 100644 --- a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js +++ b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js @@ -7,10 +7,10 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', ' function getScrollButtonHtml(direction) { var html = ''; - var icon = direction === 'left' ? '' : ''; + var icon = direction === 'left' ? 'chevron_left' : 'chevron_right'; html += ''; return html; diff --git a/src/encodingsettings.html b/src/encodingsettings.html index 5a005d8001..ff064e4373 100644 --- a/src/encodingsettings.html +++ b/src/encodingsettings.html @@ -96,7 +96,7 @@
- +
${LabelffmpegPathHelp}
@@ -107,7 +107,7 @@
- +
${LabelTranscodingTempPathHelp}
diff --git a/src/itemdetails.html b/src/itemdetails.html index 0520c80d11..5bd8b40de6 100644 --- a/src/itemdetails.html +++ b/src/itemdetails.html @@ -38,56 +38,56 @@ @@ -101,7 +101,7 @@ diff --git a/src/list.html b/src/list.html index 375653c12d..5e47eeb7fc 100644 --- a/src/list.html +++ b/src/list.html @@ -19,13 +19,13 @@ ${Shuffle} +
${LabelRecordingPathHelp}
@@ -43,7 +43,7 @@
- +
@@ -51,7 +51,7 @@
- +
@@ -84,7 +84,7 @@
- +
diff --git a/src/livetvstatus.html b/src/livetvstatus.html index fc855f32b0..c1ae0d4703 100644 --- a/src/livetvstatus.html +++ b/src/livetvstatus.html @@ -8,7 +8,7 @@ ${HeaderTunerDevices} ${Help}
@@ -21,7 +21,7 @@

${HeaderGuideProviders}

diff --git a/src/livetvtuner.html b/src/livetvtuner.html index fecbda90aa..37d0f8c30f 100644 --- a/src/livetvtuner.html +++ b/src/livetvtuner.html @@ -24,7 +24,7 @@
- + diff --git a/src/movies.html b/src/movies.html index e552ca392f..7f86e2e0e9 100644 --- a/src/movies.html +++ b/src/movies.html @@ -76,7 +76,7 @@
- +
diff --git a/src/music.html b/src/music.html index 9a284a5f8f..a42a5bb7f0 100644 --- a/src/music.html +++ b/src/music.html @@ -38,7 +38,7 @@
- + diff --git a/src/mypreferencesmenu.html b/src/mypreferencesmenu.html index 4219059dd0..8e3cd40f6b 100644 --- a/src/mypreferencesmenu.html +++ b/src/mypreferencesmenu.html @@ -5,7 +5,7 @@

- person +
${ButtonProfile}
@@ -14,7 +14,7 @@
- tv +
${HeaderDisplay}
@@ -23,7 +23,7 @@
- home +
${HeaderHome}
@@ -61,7 +61,7 @@

${HeaderAdmin}
- dashboard +
${TabDashboard}
@@ -80,7 +80,7 @@

${HeaderUser}
- wifi +
${HeaderSelectServer}
diff --git a/src/networking.html b/src/networking.html index 1352e0ef5f..f13c9231db 100644 --- a/src/networking.html +++ b/src/networking.html @@ -61,7 +61,7 @@
- +
${LabelCustomCertificatePathHelp}
diff --git a/src/nowplaying.html b/src/nowplaying.html index 0f34e5ba32..0982531d9e 100644 --- a/src/nowplaying.html +++ b/src/nowplaying.html @@ -39,11 +39,11 @@
@@ -110,19 +110,19 @@

diff --git a/src/scheduledtask.html b/src/scheduledtask.html index f5bd6550f2..12b4e3b960 100644 --- a/src/scheduledtask.html +++ b/src/scheduledtask.html @@ -13,7 +13,7 @@

${HeaderTaskTriggers}

diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js index b7cb4b5c57..22f1aa6125 100644 --- a/src/scripts/editorsidebar.js +++ b/src/scripts/editorsidebar.js @@ -43,20 +43,20 @@ define(["datetime", "jQuery", "material-icons"], function (datetime, $) { } var htmlName = "
"; if (item.IsFolder) { - htmlName += 'folder'; + htmlName += ''; } else if (item.MediaType === "Video") { - htmlName += 'movie'; + htmlName += ''; } else if (item.MediaType === "Audio") { - htmlName += 'audiotrack'; + htmlName += ''; } else if (item.Type === "TvChannel") { htmlName += ''; } else if (item.MediaType === "Photo") { - htmlName += 'photo'; + htmlName += ''; } else if (item.MediaType === "Book") { - htmlName += 'book'; + htmlName += ''; } if (item.LockData) { - htmlName += 'lock'; + htmlName += ''; } htmlName += name; htmlName += "
"; diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js index 79c4c09e78..c75dbd01f9 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -6,16 +6,16 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " html += '
'; html += '
'; html += ''; - html += ''; - html += ''; + html += ''; + html += ''; html += '

'; html += "
"; html += '
'; html += ''; html += ''; - html += ''; - html += ''; - html += ''; + html += ''; + html += ''; + html += ''; html += "
"; html += "
"; html += '
'; @@ -102,7 +102,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " headerUserButton.innerHTML = '
"; } else { headerUserButton.classList.remove("headerUserButtonRound"); - headerUserButton.innerHTML = 'person'; + headerUserButton.innerHTML = ''; } } @@ -217,7 +217,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " function refreshLibraryInfoInDrawer(user, drawer) { var html = ""; html += '
'; - html += 'home' + globalize.translate("ButtonHome") + ""; + html += '' + globalize.translate("ButtonHome") + ""; // libraries are added here html += '
'; @@ -228,7 +228,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " html += '

'; html += globalize.translate("HeaderAdmin"); html += "

"; - html += 'dashboard' + globalize.translate("TabDashboard") + ""; + html += '' + globalize.translate("TabDashboard") + ""; html += '' + globalize.translate("Metadata") + ""; html += "
"; } @@ -240,7 +240,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " html += ""; if (appHost.supports("multiserver")) { - html += 'wifi' + globalize.translate("ButtonSelectServer") + ""; + html += '' + globalize.translate("ButtonSelectServer") + ""; } html += '' + globalize.translate("ButtonSettings") + ""; @@ -335,7 +335,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " icon: "folder" }, { name: globalize.translate("TabPlayback"), - icon: "", + icon: "play_arrow", href: "encodingsettings.html", pageIds: ["encodingSettingsPage", "playbackConfigurationPage", "streamingSettingsPage"] }]; @@ -452,7 +452,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " menuHtml += '"; if (item.icon) { - menuHtml += '' + item.icon + ""; + menuHtml += ''; } menuHtml += ''; @@ -579,7 +579,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " i.onclick; } - return '' + icon + '' + i.Name + ""; + return '' + i.Name + ""; }).join(""); libraryMenuOptions.innerHTML = html; var elem = libraryMenuOptions; @@ -617,11 +617,11 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " var icon = headerCastButton.querySelector("i"); if (info && !info.isLocalPlayer) { - icon.innerHTML = ""; + icon.classList.replace("cast", "cast_connected"); headerCastButton.classList.add("castButton-active"); context.querySelector(".headerSelectedPlayer").innerHTML = info.deviceName || info.name; } else { - icon.innerHTML = "cast"; + icon.classList.replace("cast_connected", "cast"); headerCastButton.classList.remove("castButton-active"); context.querySelector(".headerSelectedPlayer").innerHTML = ""; } diff --git a/src/userparentalcontrol.html b/src/userparentalcontrol.html index 4cb5708db7..538de80a70 100644 --- a/src/userparentalcontrol.html +++ b/src/userparentalcontrol.html @@ -31,7 +31,7 @@

${LabelBlockContentWithTags}

@@ -41,7 +41,7 @@

${HeaderAccessSchedule}

diff --git a/src/userprofiles.html b/src/userprofiles.html index 022e06b95f..398d951db2 100644 --- a/src/userprofiles.html +++ b/src/userprofiles.html @@ -6,7 +6,7 @@

${HeaderUsers}

${Help}
diff --git a/src/videoosd.html b/src/videoosd.html index c200360c05..cb1e507541 100644 --- a/src/videoosd.html +++ b/src/videoosd.html @@ -8,7 +8,7 @@

- autorenew + ${FetchingData}
@@ -37,7 +37,7 @@
@@ -76,7 +76,7 @@
diff --git a/src/wizardfinish.html b/src/wizardfinish.html index d3a0c4a831..6bcec5ff0a 100644 --- a/src/wizardfinish.html +++ b/src/wizardfinish.html @@ -9,7 +9,7 @@ ${LabelPrevious}
diff --git a/src/wizardlibrary.html b/src/wizardlibrary.html index 4fad656581..7851f41f0a 100644 --- a/src/wizardlibrary.html +++ b/src/wizardlibrary.html @@ -3,7 +3,7 @@

${HeaderSetupLibrary}

- +

From ad5c7ec3b4c77a589141b700a01007171a9db2b6 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sat, 25 Apr 2020 20:25:52 +0300 Subject: [PATCH 2/6] CSS cleanup --- src/assets/css/librarybrowser.css | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css index f7a1160469..a9d8b2575b 100644 --- a/src/assets/css/librarybrowser.css +++ b/src/assets/css/librarybrowser.css @@ -644,11 +644,6 @@ div.itemDetailGalleryLink.defaultCardBackground { height: 23vw; /* Dirty hack to get it to look somewhat square. Less than ideal. */ } -.btnSyncComplete i { - -webkit-border-radius: 100em; - border-radius: 100em; -} - .itemDetailGalleryLink.defaultCardBackground > i { font-size: 15vw; margin-top: 50%; @@ -681,10 +676,6 @@ div.itemDetailGalleryLink.defaultCardBackground { } } -.btnSyncComplete { - background: #673ab7 !important; -} - .emby-button.detailFloatingButton { position: absolute; background-color: rgba(0, 0, 0, 0.5) !important; From 6fe9a8c3e98ba66613f668c0c97a4b57db57c512 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sun, 26 Apr 2020 02:37:28 +0300 Subject: [PATCH 3/6] Change icon tag to span --- src/apikeys.html | 2 +- src/assets/css/librarybrowser.css | 4 +- .../accessschedule.template.html | 2 +- src/components/actionsheet/actionsheet.js | 6 +-- src/components/activitylog.js | 8 ++-- src/components/alphapicker/alphapicker.js | 4 +- src/components/cardbuilder/cardBuilder.js | 36 +++++++-------- .../cardbuilder/chaptercardbuilder.js | 2 +- src/components/channelmapper/channelmapper.js | 6 +-- .../collectioneditor/collectioneditor.js | 4 +- .../directorybrowser/directorybrowser.js | 6 +-- src/components/favoriteitems.js | 2 +- src/components/filtermenu/filtermenu.js | 2 +- .../guide/guide-settings.template.html | 2 +- src/components/guide/guide.js | 14 +++--- src/components/guide/tvguide.template.html | 6 +-- .../homescreensettings/homescreensettings.js | 6 +-- src/components/homesections/homesections.js | 8 ++-- .../imagedownloader/imagedownloader.js | 6 +-- .../imagedownloader.template.html | 2 +- src/components/imageeditor/imageeditor.js | 12 ++--- .../imageeditor/imageeditor.template.html | 14 +++--- .../imageoptionseditor.template.html | 2 +- .../imageuploader/imageuploader.template.html | 4 +- src/components/indicators/indicators.js | 22 +++++----- .../itemMediaInfo/itemMediaInfo.template.html | 2 +- .../itemidentifier.template.html | 2 +- .../libraryoptionseditor.js | 18 ++++---- src/components/listview/listview.js | 18 ++++---- src/components/mediainfo/mediainfo.js | 10 ++--- .../medialibrarycreator.js | 2 +- .../medialibrarycreator.template.html | 4 +- .../medialibraryeditor/medialibraryeditor.js | 2 +- .../medialibraryeditor.template.html | 4 +- .../metadataeditor/metadataeditor.js | 10 ++--- .../metadataeditor.template.html | 14 +++--- .../metadataeditor/personeditor.template.html | 2 +- src/components/multiselect/multiselect.js | 4 +- src/components/nowplayingbar/nowplayingbar.js | 24 +++++----- src/components/playback/brightnessosd.js | 4 +- src/components/playback/volumeosd.js | 4 +- src/components/playerstats/playerstats.js | 2 +- .../playlisteditor/playlisteditor.js | 2 +- src/components/prompt/prompt.template.html | 2 +- .../recordingcreator/recordingbutton.js | 2 +- .../recordingcreator.template.html | 2 +- .../recordingeditor.template.html | 2 +- .../recordingcreator/recordingfields.js | 4 +- .../recordingfields.template.html | 4 +- .../seriesrecordingeditor.template.html | 2 +- src/components/refreshdialog/refreshdialog.js | 2 +- .../remotecontrol/remotecontrol.css | 4 +- src/components/remotecontrol/remotecontrol.js | 26 +++++------ .../search/searchfields.template.html | 2 +- src/components/slideshow/slideshow.js | 8 ++-- src/components/sortmenu/sortmenu.js | 2 +- .../subtitleeditor/subtitleeditor.js | 8 ++-- .../subtitleeditor.template.html | 6 +-- .../subtitlesync/subtitlesync.template.html | 2 +- src/components/tunerpicker.js | 4 +- .../tvproviders/xmltv.template.html | 2 +- .../userdatabuttons/userdatabuttons.js | 2 +- src/components/viewsettings/viewsettings.js | 2 +- src/controllers/auth/selectserver.js | 2 +- src/controllers/dashboard/dashboard.js | 12 ++--- .../dashboard/notifications/notifications.js | 6 +-- .../dashboard/plugins/available.js | 2 +- .../dashboard/plugins/installed.js | 4 +- .../dashboard/scheduledtasks/scheduledtask.js | 4 +- .../scheduledtasks/scheduledtasks.js | 8 ++-- src/controllers/devices.js | 4 +- src/controllers/dlnaprofile.js | 22 +++++----- src/controllers/dlnaprofiles.js | 4 +- src/controllers/favorites.js | 2 +- src/controllers/itemdetailpage.js | 2 +- src/controllers/livetvstatus.js | 8 ++-- src/controllers/medialibrarypage.js | 6 +-- src/controllers/movies/moviegenres.js | 4 +- src/controllers/playback/videoosd.js | 10 ++--- src/controllers/shows/tvgenres.js | 4 +- src/controllers/userparentalcontrol.js | 4 +- src/controllers/userprofilespage.js | 8 ++-- src/dashboard.html | 10 ++--- src/dashboardgeneral.html | 4 +- src/dlnaprofile.html | 4 +- src/dlnaprofiles.html | 2 +- src/elements/emby-button/emby-button.css | 6 +-- src/elements/emby-checkbox/emby-checkbox.js | 4 +- src/elements/emby-collapse/emby-collapse.js | 6 +-- .../emby-playstatebutton.js | 2 +- .../emby-ratingbutton/emby-ratingbutton.js | 2 +- .../emby-scrollbuttons/emby-scrollbuttons.css | 2 +- .../emby-scrollbuttons/emby-scrollbuttons.js | 2 +- src/elements/emby-select/emby-select.js | 2 +- src/encodingsettings.html | 4 +- src/itemdetails.html | 28 ++++++------ src/list.html | 18 ++++---- src/livetv.html | 16 +++---- src/livetvsettings.html | 8 ++-- src/livetvstatus.html | 4 +- src/livetvtuner.html | 2 +- src/movies.html | 18 ++++---- src/music.html | 22 +++++----- src/mypreferencesmenu.html | 20 ++++----- src/networking.html | 2 +- src/nowplaying.html | 44 +++++++++---------- src/scheduledtask.html | 2 +- src/scripts/editorsidebar.js | 14 +++--- src/scripts/librarybrowser.js | 10 ++--- src/scripts/librarymenu.js | 36 +++++++-------- src/tv.html | 12 ++--- src/userparentalcontrol.html | 4 +- src/userprofiles.html | 2 +- src/videoosd.html | 28 ++++++------ src/wizardfinish.html | 4 +- src/wizardlibrary.html | 6 +-- src/wizardremoteaccess.html | 4 +- src/wizardsettings.html | 4 +- src/wizardstart.html | 2 +- src/wizarduser.html | 4 +- 120 files changed, 439 insertions(+), 439 deletions(-) diff --git a/src/apikeys.html b/src/apikeys.html index 93c3e57ef6..7ca490724b 100644 --- a/src/apikeys.html +++ b/src/apikeys.html @@ -4,7 +4,7 @@

${HeaderApiKeys}

${HeaderApiKeysHelp}

diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css index a9d8b2575b..82e704f074 100644 --- a/src/assets/css/librarybrowser.css +++ b/src/assets/css/librarybrowser.css @@ -644,7 +644,7 @@ div.itemDetailGalleryLink.defaultCardBackground { height: 23vw; /* Dirty hack to get it to look somewhat square. Less than ideal. */ } -.itemDetailGalleryLink.defaultCardBackground > i { +.itemDetailGalleryLink.defaultCardBackground > .material-icons { font-size: 15vw; margin-top: 50%; transform: translateY(-50%); @@ -687,7 +687,7 @@ div.itemDetailGalleryLink.defaultCardBackground { color: rgba(255, 255, 255, 0.76); } -.emby-button.detailFloatingButton i { +.emby-button.detailFloatingButton .material-icons { font-size: 3.5em; } diff --git a/src/components/accessschedule/accessschedule.template.html b/src/components/accessschedule/accessschedule.template.html index 02f11942ed..906d20869c 100644 --- a/src/components/accessschedule/accessschedule.template.html +++ b/src/components/accessschedule/accessschedule.template.html @@ -1,6 +1,6 @@

${HeaderAccessSchedule} diff --git a/src/components/actionsheet/actionsheet.js b/src/components/actionsheet/actionsheet.js index 30e15ffeb7..0828c4bba2 100644 --- a/src/components/actionsheet/actionsheet.js +++ b/src/components/actionsheet/actionsheet.js @@ -158,7 +158,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu } if (layoutManager.tv) { - html += ''; + html += ''; } // If any items have an icon, give them all an icon just to make sure they're all lined up evenly @@ -226,9 +226,9 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu if (itemIcon) { - html += ''; + html += ''; } else if (renderIcon && !center) { - html += ''; + html += ''; } html += '
'; diff --git a/src/components/activitylog.js b/src/components/activitylog.js index 1a8707c808..796f995bc7 100644 --- a/src/components/activitylog.js +++ b/src/components/activitylog.js @@ -13,12 +13,12 @@ define(["events", "globalize", "dom", "date-fns", "dfnshelper", "userSettings", } if (entry.UserId && entry.UserPrimaryImageTag) { - html += '"; + }) + "');background-repeat:no-repeat;background-position:center center;background-size: cover;\">"; } else { - html += ''; + html += ''; } html += '
'; @@ -34,7 +34,7 @@ define(["events", "globalize", "dom", "date-fns", "dfnshelper", "userSettings", html += "
"; if (entry.Overview) { - html += ''; + html += ''; } return html += "
"; diff --git a/src/components/alphapicker/alphapicker.js b/src/components/alphapicker/alphapicker.js index 577047fca4..61ca23b8bc 100644 --- a/src/components/alphapicker/alphapicker.js +++ b/src/components/alphapicker/alphapicker.js @@ -67,7 +67,7 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b html += '
'; if (options.mode === 'keyboard') { - html += ''; + html += ''; } else { letters = ['#']; html += mapLetters(letters, vertical).join(''); @@ -77,7 +77,7 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b html += mapLetters(letters, vertical).join(''); if (options.mode === 'keyboard') { - html += ''; + html += ''; html += '
'; letters = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']; diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 70abd5e39d..faafc6f70e 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -869,7 +869,7 @@ import 'programStyles'; if (isOuterFooter && options.cardLayout && layoutManager.mobile) { if (options.cardFooterAside !== 'none') { - html += ''; + html += ''; } } @@ -1418,15 +1418,15 @@ import 'programStyles'; const btnCssClass = 'cardOverlayButton cardOverlayButton-br itemAction'; if (options.centerPlayButton) { - overlayButtons += ''; + overlayButtons += ''; } if (overlayPlayButton && !item.IsPlaceHolder && (item.LocationType !== 'Virtual' || !item.MediaType || item.Type === 'Program') && item.Type !== 'Person') { - overlayButtons += ''; + overlayButtons += ''; } if (options.overlayMoreButton) { - overlayButtons += ''; + overlayButtons += ''; } } @@ -1560,7 +1560,7 @@ import 'programStyles'; const btnCssClass = 'cardOverlayButton cardOverlayButton-hover itemAction paper-icon-button-light'; if (playbackManager.canPlay(item)) { - html += ''; + html += ''; } html += '
'; @@ -1569,7 +1569,7 @@ import 'programStyles'; if (itemHelper.canMarkPlayed(item)) { require(['emby-playstatebutton']); - html += ''; + html += ''; } if (itemHelper.canRate(item)) { @@ -1577,10 +1577,10 @@ import 'programStyles'; const likes = userData.Likes == null ? '' : userData.Likes; require(['emby-ratingbutton']); - html += ''; + html += ''; } - html += ''; + html += ''; html += '
'; html += '

'; @@ -1596,27 +1596,27 @@ import 'programStyles'; */ export function getDefaultText(item, options) { if (item.CollectionType) { - return ''; + return ''; } switch (item.Type) { case 'MusicAlbum': - return ''; + return ''; case 'MusicArtist': case 'Person': - return ''; + return ''; case 'Movie': - return ''; + return ''; case 'Series': - return ''; + return ''; case 'Book': - return ''; + return ''; case 'Folder': - return ''; + return ''; } if (options && options.defaultCardImageIcon) { - return ''; + return ''; } const defaultName = isUsingLiveTvNaming(item) ? item.Name : itemHelper.getDisplayName(item); @@ -1718,7 +1718,7 @@ import 'programStyles'; indicatorsElem = ensureIndicators(card, indicatorsElem); indicatorsElem.appendChild(playedIndicator); } - playedIndicator.innerHTML = ''; + playedIndicator.innerHTML = ''; } else { playedIndicator = card.querySelector('.playedIndicator'); @@ -1808,7 +1808,7 @@ import 'programStyles'; const icon = cell.querySelector('.timerIndicator'); if (!icon) { const indicatorsElem = ensureIndicators(cell); - indicatorsElem.insertAdjacentHTML('beforeend', ''); + indicatorsElem.insertAdjacentHTML('beforeend', ''); } cell.setAttribute('data-timerid', newTimerId); } diff --git a/src/components/cardbuilder/chaptercardbuilder.js b/src/components/cardbuilder/chaptercardbuilder.js index 16326b6c59..d0383692c1 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 += ''; + cardImageContainer += ''; } var nameHtml = ''; diff --git a/src/components/channelmapper/channelmapper.js b/src/components/channelmapper/channelmapper.js index f7b3a101e9..71d71a64ef 100644 --- a/src/components/channelmapper/channelmapper.js +++ b/src/components/channelmapper/channelmapper.js @@ -60,7 +60,7 @@ define(["dom", "dialogHelper", "loading", "connectionManager", "globalize", "act function getTunerChannelHtml(channel, providerName) { var html = ""; html += '
'; - html += ''; + html += ''; html += '
'; html += '

'; html += channel.Name; @@ -73,7 +73,7 @@ define(["dom", "dialogHelper", "loading", "connectionManager", "globalize", "act html += "

"; html += "
"; - html += ''; + html += ''; return html += "
"; } @@ -116,7 +116,7 @@ define(["dom", "dialogHelper", "loading", "connectionManager", "globalize", "act var html = ""; var title = globalize.translate("MapChannels"); html += '
'; - html += ''; + html += ''; html += '

'; html += title; html += "

"; diff --git a/src/components/collectioneditor/collectioneditor.js b/src/components/collectioneditor/collectioneditor.js index 7a14c3666c..e9aeac2001 100644 --- a/src/components/collectioneditor/collectioneditor.js +++ b/src/components/collectioneditor/collectioneditor.js @@ -230,13 +230,13 @@ define(['dom', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectio var title = items.length ? globalize.translate('HeaderAddToCollection') : globalize.translate('NewCollection'); html += '
'; - html += ''; + html += ''; html += '

'; html += title; html += '

'; if (appHost.supports('externallinks')) { - html += '' + globalize.translate('Help') + ''; + html += '' + globalize.translate('Help') + ''; } html += '
'; diff --git a/src/components/directorybrowser/directorybrowser.js b/src/components/directorybrowser/directorybrowser.js index cd84dcb28d..1d59418a95 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 += ''; + html += ''; html += "
"; return html; } @@ -116,7 +116,7 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper- html += ''; html += "
"; if (!readOnlyAttribute) { - html += ''; + html += ''; } html += "
"; if (!readOnlyAttribute) { @@ -264,7 +264,7 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper- var html = ""; html += '
'; - html += ''; + html += ''; html += '

'; html += options.header || Globalize.translate("HeaderSelectPath"); html += "

"; diff --git a/src/components/favoriteitems.js b/src/components/favoriteitems.js index 08c9d9acc5..d877cd274c 100644 --- a/src/components/favoriteitems.js +++ b/src/components/favoriteitems.js @@ -136,7 +136,7 @@ define(["loading", "libraryBrowser", "cardBuilder", "dom", "apphost", "imageLoad html += '

'; html += globalize.translate(section.name); html += "

"; - html += ''; + html += ''; html += ""; } else { html += '

' + globalize.translate(section.name) + "

"; diff --git a/src/components/filtermenu/filtermenu.js b/src/components/filtermenu/filtermenu.js index 6b08ddab16..c189856e7b 100644 --- a/src/components/filtermenu/filtermenu.js +++ b/src/components/filtermenu/filtermenu.js @@ -279,7 +279,7 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost', var html = ''; html += '
'; - html += ''; + html += ''; html += '

${Filters}

'; html += '
'; diff --git a/src/components/guide/guide-settings.template.html b/src/components/guide/guide-settings.template.html index 02701db3d2..6888ca80de 100644 --- a/src/components/guide/guide-settings.template.html +++ b/src/components/guide/guide-settings.template.html @@ -1,5 +1,5 @@
- +

${Settings}

diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js index 91ed83487a..66991d4c88 100644 --- a/src/components/guide/guide.js +++ b/src/components/guide/guide.js @@ -415,7 +415,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', var status; if (item.Type === 'SeriesTimer') { - return ''; + return ''; } else if (item.TimerId || item.SeriesTimerId) { status = item.Status || 'Cancelled'; @@ -429,13 +429,13 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', if (item.SeriesTimerId) { if (status !== 'Cancelled') { - return ''; + return ''; } - return ''; + return ''; } - return ''; + return ''; } function getChannelProgramsHtml(context, date, channel, programs, options, listInfo) { @@ -549,7 +549,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', html += '
'; - html += '
'; + html += '
'; html += '
' + program.Name; @@ -577,7 +577,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', html += '
'; if (program.IsHD && options.showHdIcon) { - //html += ''; + //html += ''; if (layoutManager.tv) { html += '
HD
'; } else { @@ -1105,7 +1105,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', var icon = cell.querySelector('.timerIcon'); if (!icon) { - cell.querySelector('.guideProgramName').insertAdjacentHTML('beforeend', ''); + cell.querySelector('.guideProgramName').insertAdjacentHTML('beforeend', ''); } if (newTimerId) { diff --git a/src/components/guide/tvguide.template.html b/src/components/guide/tvguide.template.html index ef3c4b58ca..bd4c9cc3cc 100644 --- a/src/components/guide/tvguide.template.html +++ b/src/components/guide/tvguide.template.html @@ -10,7 +10,7 @@
@@ -30,9 +30,9 @@
diff --git a/src/components/homescreensettings/homescreensettings.js b/src/components/homescreensettings/homescreensettings.js index ccc6fa75f4..67a4ac165d 100644 --- a/src/components/homescreensettings/homescreensettings.js +++ b/src/components/homescreensettings/homescreensettings.js @@ -149,7 +149,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa currentHtml += '
'; - currentHtml += ''; + currentHtml += ''; currentHtml += '
'; @@ -159,8 +159,8 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa currentHtml += '
'; - currentHtml += ''; - currentHtml += ''; + currentHtml += ''; + currentHtml += ''; currentHtml += '
'; diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js index cb4866a1cc..74f8bc6620 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 += '' + item.Name + ''; + html += '' + item.Name + ''; } html += '
'; @@ -282,7 +282,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la html += '

'; html += globalize.translate('LatestFromLibrary', parent.Name); html += '

'; - html += ''; + html += ''; html += ''; } else { html += '

' + globalize.translate('LatestFromLibrary', parent.Name) + '

'; @@ -630,7 +630,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la html += '

'; html += globalize.translate('HeaderOnNow'); html += '

'; - html += ''; + html += ''; html += ''; } else { @@ -705,7 +705,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la html += '

'; html += globalize.translate('HeaderNextUp'); html += '

'; - html += ''; + html += ''; html += ''; } else { html += '

' + globalize.translate('HeaderNextUp') + '

'; diff --git a/src/components/imagedownloader/imagedownloader.js b/src/components/imagedownloader/imagedownloader.js index 9df083aea2..01dd7e312b 100644 --- a/src/components/imagedownloader/imagedownloader.js +++ b/src/components/imagedownloader/imagedownloader.js @@ -116,8 +116,8 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image if (showControls) { html += '
'; - html += ''; - html += ''; + html += ''; + html += ''; html += '
'; } @@ -262,7 +262,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image if (enableFooterButtons) { html += '
'; - html += ''; + html += ''; html += '
'; } diff --git a/src/components/imagedownloader/imagedownloader.template.html b/src/components/imagedownloader/imagedownloader.template.html index dec796fb05..6ca2a2418c 100644 --- a/src/components/imagedownloader/imagedownloader.template.html +++ b/src/components/imagedownloader/imagedownloader.template.html @@ -1,5 +1,5 @@
- +

${Search}

diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js index b2c3ecc19f..899a31cab1 100644 --- a/src/components/imageeditor/imageeditor.js +++ b/src/components/imageeditor/imageeditor.js @@ -155,23 +155,23 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', if (image.ImageType === "Backdrop" || image.ImageType === "Screenshot") { if (index > 0) { - html += ''; + html += ''; } else { - html += ''; + html += ''; } if (index < numImages - 1) { - html += ''; + html += ''; } else { - html += ''; + html += ''; } } else { if (imageProviders.length) { - html += ''; + html += ''; } } - html += ''; + html += ''; html += '
'; } diff --git a/src/components/imageeditor/imageeditor.template.html b/src/components/imageeditor/imageeditor.template.html index 92a05ec062..1bf34f1aac 100644 --- a/src/components/imageeditor/imageeditor.template.html +++ b/src/components/imageeditor/imageeditor.template.html @@ -1,5 +1,5 @@
- +

${HeaderEditImages}

@@ -12,10 +12,10 @@

${Images}

@@ -27,10 +27,10 @@

${Backdrops}

@@ -42,10 +42,10 @@

${Screenshots}

diff --git a/src/components/imageoptionseditor/imageoptionseditor.template.html b/src/components/imageoptionseditor/imageoptionseditor.template.html index 910d8fdd6e..cbbc3b85f5 100644 --- a/src/components/imageoptionseditor/imageoptionseditor.template.html +++ b/src/components/imageoptionseditor/imageoptionseditor.template.html @@ -1,5 +1,5 @@
- +

${HeaderImageOptions}

diff --git a/src/components/imageuploader/imageuploader.template.html b/src/components/imageuploader/imageuploader.template.html index 0e2d884d5f..75f5723751 100644 --- a/src/components/imageuploader/imageuploader.template.html +++ b/src/components/imageuploader/imageuploader.template.html @@ -1,5 +1,5 @@
- +

${HeaderUploadImage}

@@ -14,7 +14,7 @@

${HeaderAddUpdateImage}

diff --git a/src/components/indicators/indicators.js b/src/components/indicators/indicators.js index 90520653c4..e03900364a 100644 --- a/src/components/indicators/indicators.js +++ b/src/components/indicators/indicators.js @@ -90,7 +90,7 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm } if (userData.PlayedPercentage && userData.PlayedPercentage >= 100 || (userData.Played)) { - return '
'; + return '
'; } } @@ -118,7 +118,7 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm var status; if (item.Type === 'SeriesTimer') { - return ''; + return ''; } else if (item.TimerId || item.SeriesTimerId) { status = item.Status || 'Cancelled'; } else if (item.Type === 'Timer') { @@ -129,20 +129,20 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm if (item.SeriesTimerId) { if (status !== 'Cancelled') { - return ''; + return ''; } - return ''; + return ''; } - return ''; + return ''; } function getSyncIndicator(item) { if (item.SyncPercent === 100) { - return '
'; + return '
'; } else if (item.SyncPercent != null) { - return '
'; + return '
'; } return ''; @@ -150,16 +150,16 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm function getTypeIndicator(item) { if (item.Type === 'Video') { - return '
'; + return '
'; } if (item.Type === 'Folder') { - return '
'; + return '
'; } if (item.Type === 'PhotoAlbum') { - return '
'; + return '
'; } if (item.Type === 'Photo') { - return '
'; + return '
'; } return ''; diff --git a/src/components/itemMediaInfo/itemMediaInfo.template.html b/src/components/itemMediaInfo/itemMediaInfo.template.html index d5f583dcab..bc8ce59680 100644 --- a/src/components/itemMediaInfo/itemMediaInfo.template.html +++ b/src/components/itemMediaInfo/itemMediaInfo.template.html @@ -1,6 +1,6 @@

${HeaderMediaInfo}

diff --git a/src/components/itemidentifier/itemidentifier.template.html b/src/components/itemidentifier/itemidentifier.template.html index 9b3e58a864..9ea0e945db 100644 --- a/src/components/itemidentifier/itemidentifier.template.html +++ b/src/components/itemidentifier/itemidentifier.template.html @@ -1,6 +1,6 @@

${Identify}

diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js index 08197299e0..d1dab9cb74 100644 --- a/src/components/libraryoptionseditor/libraryoptionseditor.js +++ b/src/components/libraryoptionseditor/libraryoptionseditor.js @@ -58,16 +58,16 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct for (var i = 0; i < plugins.length; i++) { var plugin = plugins[i]; html += '
'; - html += ''; + html += ''; html += '
'; html += '

'; html += plugin.Name; html += "

"; html += "
"; if (i > 0) { - html += ''; + html += ''; } else if (plugins.length > 1) { - html += ''; + html += ''; } html += "
"; } @@ -120,7 +120,7 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct html += plugin.Name; html += ""; html += "
"; - i > 0 ? html += '' : plugins.length > 1 && (html += ''), html += "
"; + i > 0 ? html += '' : plugins.length > 1 && (html += ''), html += "
"; } html += "
"; html += '
' + globalize.translate("LabelMetadataDownloadersHelp") + "
"; @@ -181,9 +181,9 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct html += ""; html += "
"; if (i > 0) { - html += ''; + html += ''; } else if (plugins.length > 1) { - html += ''; + html += ''; } html += "
"; } @@ -220,9 +220,9 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct html += ""; html += "
"; if (i > 0) { - html += ''; + html += ''; } else if (plugins.length > 1) { - html += ''; + html += ''; } html += "
"; } @@ -273,7 +273,7 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct function adjustSortableListElement(elem) { var btnSortable = elem.querySelector(".btnSortable"); - var inner = btnSortable.querySelector("i"); + var inner = btnSortable.querySelector(".material-icons"); if (elem.previousSibling) { btnSortable.title = globalize.translate("ButtonUp"); btnSortable.classList.add("btnSortableMoveUp"); diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js index 99551245df..bb00cf65cb 100644 --- a/src/components/listview/listview.js +++ b/src/components/listview/listview.js @@ -160,7 +160,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan var button = options.rightButtons[i]; - html += ''; + html += ''; } return html; @@ -262,9 +262,9 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan } if (!clickEntireItem && options.dragHandle) { - //html += ''; + //html += ''; // Firefox and Edge are not allowing the button to be draggable - html += ''; + html += ''; } if (options.image !== false) { @@ -297,7 +297,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan } if (playOnImageClick) { - html += ''; + html += ''; } var progressHtml = indicators.getProgressBarHtml(item, { @@ -475,15 +475,15 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan if (!clickEntireItem) { if (options.addToListButton) { - html += ''; + html += ''; } if (options.moreButton !== false) { - html += ''; + html += ''; } if (options.infoButton) { - html += ''; + html += ''; } if (options.rightButtons) { @@ -496,11 +496,11 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan var likes = userData.Likes == null ? '' : userData.Likes; if (itemHelper.canMarkPlayed(item)) { - html += ''; + html += ''; } if (itemHelper.canRate(item)) { - html += ''; + html += ''; } } } diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js index e2b7dfb353..db3b896f0e 100644 --- a/src/components/mediainfo/mediainfo.js +++ b/src/components/mediainfo/mediainfo.js @@ -6,7 +6,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater var status; if (item.Type === 'SeriesTimer') { - return ''; + return ''; } else if (item.TimerId || item.SeriesTimerId) { status = item.Status || 'Cancelled'; @@ -20,13 +20,13 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater if (item.SeriesTimerId) { if (status !== 'Cancelled') { - return ''; + return ''; } - return ''; + return ''; } - return ''; + return ''; } function getProgramInfoHtml(item, options) { @@ -390,7 +390,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater if (item.CommunityRating) { html += '
'; - html += ''; + html += ''; html += item.CommunityRating.toFixed(1); html += '
'; } diff --git a/src/components/medialibrarycreator/medialibrarycreator.js b/src/components/medialibrarycreator/medialibrarycreator.js index 120e72bcfe..3e607ec0dd 100644 --- a/src/components/medialibrarycreator/medialibrarycreator.js +++ b/src/components/medialibrarycreator/medialibrarycreator.js @@ -116,7 +116,7 @@ define(["loading", "dialogHelper", "dom", "jQuery", "components/libraryoptionsed } html += "
"; - html += ''; + html += ''; html += "
"; return html; } diff --git a/src/components/medialibrarycreator/medialibrarycreator.template.html b/src/components/medialibrarycreator/medialibrarycreator.template.html index fe701b8c8c..f92a63e403 100644 --- a/src/components/medialibrarycreator/medialibrarycreator.template.html +++ b/src/components/medialibrarycreator/medialibrarycreator.template.html @@ -1,5 +1,5 @@
- +

${ButtonAddMediaLibrary}

@@ -26,7 +26,7 @@

${HeadersFolders}

diff --git a/src/components/medialibraryeditor/medialibraryeditor.js b/src/components/medialibraryeditor/medialibraryeditor.js index 7bf2453a6f..7a6d0bf598 100644 --- a/src/components/medialibraryeditor/medialibraryeditor.js +++ b/src/components/medialibraryeditor/medialibraryeditor.js @@ -107,7 +107,7 @@ define(["jQuery", "loading", "dialogHelper", "dom", "components/libraryoptionsed } html += ""; - html += ''; + html += ''; html += ""; return html; } diff --git a/src/components/medialibraryeditor/medialibraryeditor.template.html b/src/components/medialibraryeditor/medialibraryeditor.template.html index faa15afe9f..6c814cf2dd 100644 --- a/src/components/medialibraryeditor/medialibraryeditor.template.html +++ b/src/components/medialibraryeditor/medialibraryeditor.template.html @@ -1,5 +1,5 @@
- +

@@ -20,7 +20,7 @@

${HeadersFolders}

diff --git a/src/components/metadataeditor/metadataeditor.js b/src/components/metadataeditor/metadataeditor.js index 2ee4248aa9..db81423cf0 100644 --- a/src/components/metadataeditor/metadataeditor.js +++ b/src/components/metadataeditor/metadataeditor.js @@ -482,7 +482,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi html += ''; if (formatString) { - html += ''; + html += ''; } html += ''; @@ -922,7 +922,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi for (var i = 0; i < items.length; i++) { html += '
'; - html += ''; + html += ''; html += '
'; @@ -932,7 +932,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi html += '
'; - html += ''; + html += ''; html += '
'; } @@ -953,7 +953,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi html += '
'; - html += ''; + html += ''; html += '
'; html += ''; html += '
'; - html += ''; + html += ''; html += '
'; } diff --git a/src/components/metadataeditor/metadataeditor.template.html b/src/components/metadataeditor/metadataeditor.template.html index 87a929fa20..39894d4f6f 100644 --- a/src/components/metadataeditor/metadataeditor.template.html +++ b/src/components/metadataeditor/metadataeditor.template.html @@ -1,15 +1,15 @@
- +

${Edit}

@@ -184,7 +184,7 @@ ${Genres}
@@ -193,7 +193,7 @@ ${People}
@@ -203,7 +203,7 @@ ${Studios}
@@ -212,7 +212,7 @@ ${Tags}
diff --git a/src/components/metadataeditor/personeditor.template.html b/src/components/metadataeditor/personeditor.template.html index ec76f58c70..40b29767fa 100644 --- a/src/components/metadataeditor/personeditor.template.html +++ b/src/components/metadataeditor/personeditor.template.html @@ -1,5 +1,5 @@
- +

${Edit}

diff --git a/src/components/multiselect/multiselect.js b/src/components/multiselect/multiselect.js index 89550135b5..375c6c9e5b 100644 --- a/src/components/multiselect/multiselect.js +++ b/src/components/multiselect/multiselect.js @@ -126,11 +126,11 @@ define(["browser", "appStorage", "apphost", "loading", "connectionManager", "glo var html = ""; - html += ''; + html += ''; html += '

'; const moreIcon = "more_horiz"; - html += ''; + html += ''; selectionCommandsPanel.innerHTML = html; diff --git a/src/components/nowplayingbar/nowplayingbar.js b/src/components/nowplayingbar/nowplayingbar.js index b248a260ab..bfae96b027 100644 --- a/src/components/nowplayingbar/nowplayingbar.js +++ b/src/components/nowplayingbar/nowplayingbar.js @@ -42,31 +42,31 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', // The onclicks are needed due to the return false above html += '
'; - html += ''; + html += ''; - html += ''; + html += ''; - html += ''; - html += ''; + html += ''; + html += ''; html += '
'; html += '
'; html += '
'; - html += ''; + html += ''; html += '
'; html += ''; html += '
'; - html += ''; + html += ''; html += '
'; html += '
'; - html += ''; - html += ''; + html += ''; + html += ''; html += '
'; html += '
'; @@ -174,7 +174,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', } }); - toggleRepeatButtonIcon = toggleRepeatButton.querySelector('i'); + toggleRepeatButtonIcon = toggleRepeatButton.querySelector('.material-icons'); volumeSlider = elem.querySelector('.nowPlayingBarVolumeSlider'); volumeSliderContainer = elem.querySelector('.nowPlayingBarVolumeSliderContainer'); @@ -289,7 +289,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', if (isPaused) icons = icons.reverse(); for (i = 0, length = playPauseButtons.length; i < length; i++) { - playPauseButtons[i].querySelector('i').classList.replace(icons[0], icons[1]); + playPauseButtons[i].querySelector('.material-icons').classList.replace(icons[0], icons[1]); } } } @@ -394,7 +394,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', let icons = ["volume_off", "volume_up"]; if (isMuted) icons = icons.reverse(); - muteButton.querySelector('i').classList.replace(icons[0], icons[1]); + muteButton.querySelector('.material-icons').classList.replace(icons[0], icons[1]); if (supportedCommands.indexOf('SetVolume') === -1) { showVolumeSlider = false; @@ -557,7 +557,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', queue: false, positionTo: contextButton }; - nowPlayingUserData.innerHTML = ''; + nowPlayingUserData.innerHTML = ''; apiClient.getCurrentUser().then(function(user) { contextButton.addEventListener('click', function () { itemContextMenu.show(Object.assign({ diff --git a/src/components/playback/brightnessosd.js b/src/components/playback/brightnessosd.js index e73fc39689..5ed2b8f81f 100644 --- a/src/components/playback/brightnessosd.js +++ b/src/components/playback/brightnessosd.js @@ -11,7 +11,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia function getOsdElementHtml() { var html = ''; - html += ''; + html += ''; html += '
'; @@ -32,7 +32,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia elem.classList.add('brightnessOsd'); elem.innerHTML = getOsdElementHtml(); - iconElement = elem.querySelector('i'); + iconElement = elem.querySelector('.material-icons'); progressElement = elem.querySelector('.iconOsdProgressInner'); document.body.appendChild(elem); diff --git a/src/components/playback/volumeosd.js b/src/components/playback/volumeosd.js index 1a0c566e55..ab124ab22b 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 += '
'; @@ -32,7 +32,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia elem.classList.add('volumeOsd'); elem.innerHTML = getOsdElementHtml(); - iconElement = elem.querySelector('i'); + iconElement = elem.querySelector('.material-icons'); progressElement = elem.querySelector('.iconOsdProgressInner'); document.body.appendChild(elem); diff --git a/src/components/playerstats/playerstats.js b/src/components/playerstats/playerstats.js index 572f653fc6..74c36597b1 100644 --- a/src/components/playerstats/playerstats.js +++ b/src/components/playerstats/playerstats.js @@ -18,7 +18,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'playMeth if (layoutManager.tv) { button = ''; } else { - button = ''; + button = ''; } var contentClass = layoutManager.tv ? 'playerStats-content playerStats-content-tv' : 'playerStats-content'; diff --git a/src/components/playlisteditor/playlisteditor.js b/src/components/playlisteditor/playlisteditor.js index 69356a38c9..93beb182de 100644 --- a/src/components/playlisteditor/playlisteditor.js +++ b/src/components/playlisteditor/playlisteditor.js @@ -228,7 +228,7 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackMan var title = globalize.translate('HeaderAddToPlaylist'); html += '
'; - html += ''; + html += ''; html += '

'; html += title; html += '

'; diff --git a/src/components/prompt/prompt.template.html b/src/components/prompt/prompt.template.html index 23b918a1f2..981fa9f102 100644 --- a/src/components/prompt/prompt.template.html +++ b/src/components/prompt/prompt.template.html @@ -1,6 +1,6 @@

diff --git a/src/components/recordingcreator/recordingbutton.js b/src/components/recordingcreator/recordingbutton.js index e9c174bfd6..c4bfc43010 100644 --- a/src/components/recordingcreator/recordingbutton.js +++ b/src/components/recordingcreator/recordingbutton.js @@ -22,7 +22,7 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom' } function setButtonIcon(button, icon) { - var inner = button.querySelector('i'); + var inner = button.querySelector('.material-icons'); inner.classList.remove('fiber_smart_record'); inner.classList.remove('fiber_manual_record'); inner.classList.add(icon); diff --git a/src/components/recordingcreator/recordingcreator.template.html b/src/components/recordingcreator/recordingcreator.template.html index b99ead300a..8d7d75c8f6 100644 --- a/src/components/recordingcreator/recordingcreator.template.html +++ b/src/components/recordingcreator/recordingcreator.template.html @@ -1,5 +1,5 @@
- +

diff --git a/src/components/recordingcreator/recordingeditor.template.html b/src/components/recordingcreator/recordingeditor.template.html index 48256da0a2..f7a9f98ee6 100644 --- a/src/components/recordingcreator/recordingeditor.template.html +++ b/src/components/recordingcreator/recordingeditor.template.html @@ -1,5 +1,5 @@
- +

${HeaderRecordingOptions}

diff --git a/src/components/recordingcreator/recordingfields.js b/src/components/recordingcreator/recordingfields.js index 106fec36bf..b4cbdfab0a 100644 --- a/src/components/recordingcreator/recordingfields.js +++ b/src/components/recordingcreator/recordingfields.js @@ -151,7 +151,7 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa var apiClient = connectionManager.getApiClient(options.serverId); var button = dom.parentWithTag(e.target, 'BUTTON'); - var isChecked = !button.querySelector('i').classList.contains('recordingIcon-active'); + var isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active'); var hasEnabledTimer = this.TimerId && this.Status !== 'Cancelled'; @@ -191,7 +191,7 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa var apiClient = connectionManager.getApiClient(options.serverId); var button = dom.parentWithTag(e.target, 'BUTTON'); - var isChecked = !button.querySelector('i').classList.contains('recordingIcon-active'); + var isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active'); if (isChecked) { options.parent.querySelector('.recordSeriesContainer').classList.remove('hide'); diff --git a/src/components/recordingcreator/recordingfields.template.html b/src/components/recordingcreator/recordingfields.template.html index ce35960716..25a0c3c30d 100644 --- a/src/components/recordingcreator/recordingfields.template.html +++ b/src/components/recordingcreator/recordingfields.template.html @@ -2,7 +2,7 @@
@@ -14,7 +14,7 @@
diff --git a/src/components/recordingcreator/seriesrecordingeditor.template.html b/src/components/recordingcreator/seriesrecordingeditor.template.html index fa9f16561b..582c1a633c 100644 --- a/src/components/recordingcreator/seriesrecordingeditor.template.html +++ b/src/components/recordingcreator/seriesrecordingeditor.template.html @@ -1,5 +1,5 @@
- +

${HeaderSeriesOptions}

diff --git a/src/components/refreshdialog/refreshdialog.js b/src/components/refreshdialog/refreshdialog.js index 1e54d98372..3edb725c4a 100644 --- a/src/components/refreshdialog/refreshdialog.js +++ b/src/components/refreshdialog/refreshdialog.js @@ -110,7 +110,7 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionM var title = globalize.translate('RefreshMetadata'); html += '
'; - html += ''; + html += ''; html += '

'; html += title; html += '

'; diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css index 9cdfcde151..073c925339 100644 --- a/src/components/remotecontrol/remotecontrol.css +++ b/src/components/remotecontrol/remotecontrol.css @@ -152,7 +152,7 @@ color: inherit !important; } -.contextMenuList i.listItemIcon { +.contextMenuList .material-icons.listItemIcon { font-size: x-large; } @@ -643,7 +643,7 @@ display: none !important; } - .navigationSection .collapseContent i { + .navigationSection .collapseContent .material-icons { font-size: 4em; } } diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js index 6b7a7d7738..3dce80ecde 100644 --- a/src/components/remotecontrol/remotecontrol.js +++ b/src/components/remotecontrol/remotecontrol.js @@ -124,8 +124,8 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL artistName = item.ArtistItems[0].Name; context.querySelector(".nowPlayingAlbum").innerHTML = '${albumName}`; context.querySelector(".nowPlayingArtist").innerHTML = '${artistName}`; - context.querySelector(".contextMenuAlbum").innerHTML = ' ` + globalize.translate("ViewAlbum") + ''; - context.querySelector(".contextMenuArtist").innerHTML = ' ` + globalize.translate("ViewArtist") + ''; + context.querySelector(".contextMenuAlbum").innerHTML = ' ` + globalize.translate("ViewAlbum") + ''; + context.querySelector(".contextMenuArtist").innerHTML = ' ` + globalize.translate("ViewArtist") + ''; } else { artistName = item.Artists; context.querySelector(".nowPlayingAlbum").innerHTML = albumName; @@ -171,8 +171,8 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) { var userData = fullItem.UserData || {}; var likes = null == userData.Likes ? "" : userData.Likes; - context.querySelector(".nowPlayingPageUserDataButtonsTitle").innerHTML = ''; - context.querySelector(".nowPlayingPageUserDataButtons").innerHTML = ''; + context.querySelector(".nowPlayingPageUserDataButtonsTitle").innerHTML = ''; + context.querySelector(".nowPlayingPageUserDataButtons").innerHTML = ''; }); } else { backdrop.clear(); @@ -196,7 +196,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL context.querySelector(".nowPlayingPageImage").classList.remove("nowPlayingPageImageAudio"); } } else { - imgContainer.innerHTML = '
'; + imgContainer.innerHTML = '
'; } } @@ -319,13 +319,13 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL var toggleRepeatButton = context.querySelector(".repeatToggleButton"); if ("RepeatAll" == repeatMode) { - toggleRepeatButton.innerHTML = ""; + toggleRepeatButton.innerHTML = ""; toggleRepeatButton.classList.add("repeatButton-active"); } else if ("RepeatOne" == repeatMode) { - toggleRepeatButton.innerHTML = ""; + toggleRepeatButton.innerHTML = ""; toggleRepeatButton.classList.add("repeatButton-active"); } else { - toggleRepeatButton.innerHTML = ""; + toggleRepeatButton.innerHTML = ""; toggleRepeatButton.classList.remove("repeatButton-active"); } } @@ -351,10 +351,10 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL if (isMuted) { view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Unmute")); - view.querySelector(".buttonMute i").classList.replace("volume_up", "volume_off"); + view.querySelector(".buttonMute .material-icons").classList.replace("volume_up", "volume_off"); } else { view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Mute")); - view.querySelector(".buttonMute i").classList.replace("volume_off", "volume_up"); + view.querySelector(".buttonMute .material-icons").classList.replace("volume_off", "volume_up"); } if (showMuteButton) { @@ -384,7 +384,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL var btnPlayPause = context.querySelector(".btnPlayPause"); let icons = ["play_circle_filled", "pause_circle_filled"]; if (isPaused) icons = icons.reverse(); - btnPlayPause.querySelector("i").classList.replace(icons[0], icons[1]); + btnPlayPause.querySelector(".material-icons").classList.replace(icons[0], icons[1]); buttonVisible(btnPlayPause, isActive); } @@ -674,9 +674,9 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL playbackManager.setVolume(this.value, currentPlayer); } - var contextmenuHtml = ''; + var contextmenuHtml = ''; var volumecontrolHtml = '
'; - volumecontrolHtml += ''; + volumecontrolHtml += ''; volumecontrolHtml += '
'; volumecontrolHtml += '
'; if (!layoutManager.mobile) { diff --git a/src/components/search/searchfields.template.html b/src/components/search/searchfields.template.html index 40b916882d..7da5e240c5 100644 --- a/src/components/search/searchfields.template.html +++ b/src/components/search/searchfields.template.html @@ -1,5 +1,5 @@
- +
diff --git a/src/components/slideshow/slideshow.js b/src/components/slideshow/slideshow.js index 48ccee21c8..8a6e8069c1 100644 --- a/src/components/slideshow/slideshow.js +++ b/src/components/slideshow/slideshow.js @@ -92,7 +92,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f function getIcon(icon, cssClass, canFocus, autoFocus) { var tabIndex = canFocus ? '' : ' tabindex="-1"'; autoFocus = autoFocus ? ' autofocus' : ''; - return ''; + return ''; } /** @@ -224,7 +224,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f * Handles OSD changes when the autoplay is started. */ function onAutoplayStart() { - var btnSlideshowPause = dialog.querySelector('.btnSlideshowPause i'); + var btnSlideshowPause = dialog.querySelector('.btnSlideshowPause .material-icons'); if (btnSlideshowPause) { btnSlideshowPause.classList.replace("play_arrow", "pause"); } @@ -234,7 +234,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f * Handles OSD changes when the autoplay is stopped. */ function onAutoplayStop() { - var btnSlideshowPause = dialog.querySelector('.btnSlideshowPause i'); + var btnSlideshowPause = dialog.querySelector('.btnSlideshowPause .material-icons'); if (btnSlideshowPause) { btnSlideshowPause.classList.replace("pause", "play_arrow"); } @@ -418,7 +418,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f * Toggles the autoplay feature of the Swiper instance. */ function playPause() { - var paused = !dialog.querySelector('.btnSlideshowPause i').classList.contains("pause"); + var paused = !dialog.querySelector('.btnSlideshowPause .material-icons').classList.contains("pause"); if (paused) { play(); } else { diff --git a/src/components/sortmenu/sortmenu.js b/src/components/sortmenu/sortmenu.js index a0b40acaf6..9950afb89a 100644 --- a/src/components/sortmenu/sortmenu.js +++ b/src/components/sortmenu/sortmenu.js @@ -66,7 +66,7 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutMana var html = ''; html += '
'; - html += ''; + html += ''; html += '

${Sort}

'; html += '
'; diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js index ea1bee4f3e..c8296998e8 100644 --- a/src/components/subtitleeditor/subtitleeditor.js +++ b/src/components/subtitleeditor/subtitleeditor.js @@ -132,7 +132,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings', itemHtml += '<' + tagName + ' class="' + className + '" data-index="' + s.Index + '">'; - itemHtml += ''; + itemHtml += ''; itemHtml += '
'; @@ -149,7 +149,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings', if (!layoutManager.tv) { if (s.Path) { - itemHtml += ''; + itemHtml += ''; } } @@ -248,7 +248,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings', html += '<' + tagName + ' class="' + className + '" data-subid="' + result.Id + '">'; - html += ''; + html += ''; var bodyClass = result.Comment || result.IsHashMatch ? 'three-line' : 'two-line'; @@ -281,7 +281,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings', html += '
'; if (!layoutManager.tv) { - html += ''; + html += ''; } html += ''; diff --git a/src/components/subtitleeditor/subtitleeditor.template.html b/src/components/subtitleeditor/subtitleeditor.template.html index 57d83d618c..01066ecc66 100644 --- a/src/components/subtitleeditor/subtitleeditor.template.html +++ b/src/components/subtitleeditor/subtitleeditor.template.html @@ -1,8 +1,8 @@
- +

${Subtitles}

- ${Help} + ${Help}
@@ -18,7 +18,7 @@
- +
diff --git a/src/components/subtitlesync/subtitlesync.template.html b/src/components/subtitlesync/subtitlesync.template.html index eaf4a2993b..4ca039aa03 100644 --- a/src/components/subtitlesync/subtitlesync.template.html +++ b/src/components/subtitlesync/subtitlesync.template.html @@ -1,5 +1,5 @@
- +
0s
diff --git a/src/components/tunerpicker.js b/src/components/tunerpicker.js index bd4484abe0..310f75808c 100644 --- a/src/components/tunerpicker.js +++ b/src/components/tunerpicker.js @@ -41,7 +41,7 @@ define(["dialogHelper", "dom", "layoutManager", "connectionManager", "globalize" html += '
'; html += '
'; html += '
'; - html += '
'; + html += '
'; html += "
"; html += "
"; html += '
'; @@ -128,7 +128,7 @@ define(["dialogHelper", "dom", "layoutManager", "connectionManager", "globalize" dlg.classList.add("formDialog"); var html = ""; html += '
'; - html += ''; + html += ''; html += '

'; html += globalize.translate("HeaderLiveTvTunerSetup"); html += "

"; diff --git a/src/components/tvproviders/xmltv.template.html b/src/components/tvproviders/xmltv.template.html index f48bfb3857..e8dc434165 100644 --- a/src/components/tvproviders/xmltv.template.html +++ b/src/components/tvproviders/xmltv.template.html @@ -12,7 +12,7 @@
- +
${XmlTvPathHelp}
diff --git a/src/components/userdatabuttons/userdatabuttons.js b/src/components/userdatabuttons/userdatabuttons.js index 1c1d794080..c7890a2fcf 100644 --- a/src/components/userdatabuttons/userdatabuttons.js +++ b/src/components/userdatabuttons/userdatabuttons.js @@ -30,7 +30,7 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto iconCssClass += 'material-icons'; - return ''; + return ''; } function onContainerClick(e) { diff --git a/src/components/viewsettings/viewsettings.js b/src/components/viewsettings/viewsettings.js index d40c4d9618..441c35157b 100644 --- a/src/components/viewsettings/viewsettings.js +++ b/src/components/viewsettings/viewsettings.js @@ -77,7 +77,7 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne var html = ''; html += '
'; - html += ''; + html += ''; html += '

${Settings}

'; html += '
'; diff --git a/src/controllers/auth/selectserver.js b/src/controllers/auth/selectserver.js index 91eebf8cee..e808404926 100644 --- a/src/controllers/auth/selectserver.js +++ b/src/controllers/auth/selectserver.js @@ -18,7 +18,7 @@ define(["loading", "appRouter", "layoutManager", "appSettings", "apphost", "focu var cardImageContainer; if (item.showIcon) { - cardImageContainer = ''; + cardImageContainer = ''; } else { cardImageContainer = '
'; } diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js index 7246b4871f..ed16d90a38 100644 --- a/src/controllers/dashboard/dashboard.js +++ b/src/controllers/dashboard/dashboard.js @@ -305,14 +305,14 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa var btnCssClass = session.ServerId && session.NowPlayingItem && session.SupportsRemoteControl ? "" : " hide"; const playIcon = session.PlayState.IsPaused ? 'pause' : 'play_arrow'; - html += ''; - html += ''; + html += ''; + html += ''; btnCssClass = session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length ? "" : " hide"; - html += ''; + html += ''; btnCssClass = session.ServerId && -1 !== session.SupportedCommands.indexOf("DisplayMessage") && session.DeviceId !== connectionManager.deviceId() ? "" : " hide"; - html += ''; + html += ''; html += "
"; html += '
'; @@ -368,7 +368,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa html += progress + "%"; html += ""; html += "" + progress + "%"; - html += ''; + html += ''; } else if (task.State === "Cancelling") { html += '' + globalize.translate("LabelStopping") + ""; } @@ -573,7 +573,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa let icons = ["play_arrow", "pause"]; if (session.PlayState && session.PlayState.IsPaused) icons = icons.reverse(); - btnSessionPlayPause.querySelector("i").classList.replace(icons[0], icons[1]); + btnSessionPlayPause.querySelector(".material-icons").classList.replace(icons[0], icons[1]); row.querySelector(".sessionNowPlayingStreamInfo").innerHTML = DashboardPage.getSessionNowPlayingStreamInfo(session); row.querySelector(".sessionNowPlayingTime").innerHTML = DashboardPage.getSessionNowPlayingTime(session); diff --git a/src/controllers/dashboard/notifications/notifications.js b/src/controllers/dashboard/notifications/notifications.js index 3c0b5e9b36..85cf956305 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 += ''; + itemHtml += ''; } else { - itemHtml += ''; + itemHtml += ''; } itemHtml += '
'; itemHtml += '
' + notification.Name + "
"; itemHtml += "
"; - itemHtml += ''; + itemHtml += ''; itemHtml += ""; return itemHtml; }).join(""); diff --git a/src/controllers/dashboard/plugins/available.js b/src/controllers/dashboard/plugins/available.js index 54440aa85c..436a110316 100644 --- a/src/controllers/dashboard/plugins/available.js +++ b/src/controllers/dashboard/plugins/available.js @@ -103,7 +103,7 @@ define(["loading", "libraryMenu", "globalize", "cardStyle", "emby-button", "emby html += '
"; html += "
"; } else { - html += ''; + html += ''; } html += ""; diff --git a/src/controllers/dashboard/plugins/installed.js b/src/controllers/dashboard/plugins/installed.js index a326e24777..d046076325 100644 --- a/src/controllers/dashboard/plugins/installed.js +++ b/src/controllers/dashboard/plugins/installed.js @@ -47,14 +47,14 @@ define(["loading", "libraryMenu", "dom", "globalize", "cardStyle", "emby-button" html += '
"; html += "
"; } else { - html += ''; + html += ''; } html += configPageUrl ? "" : "
"; html += "
"; html += '
'; html += '
'; - html += ''; + html += ''; html += "
"; html += "
"; html += configPage ? configPage.DisplayName || plugin.Name : plugin.Name; diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtask.js b/src/controllers/dashboard/scheduledtasks/scheduledtask.js index aa56b0bc1a..9f1394b112 100644 --- a/src/controllers/dashboard/scheduledtasks/scheduledtask.js +++ b/src/controllers/dashboard/scheduledtasks/scheduledtask.js @@ -49,7 +49,7 @@ define(["jQuery", "loading", "datetime", "dom", "globalize", "emby-input", "emby var trigger = task.Triggers[i]; html += '
'; - html += ''; + html += ''; if (trigger.MaxRuntimeMs) { html += '
'; } else { @@ -68,7 +68,7 @@ define(["jQuery", "loading", "datetime", "dom", "globalize", "emby-input", "emby } html += "
"; - html += ''; + html += ''; html += "
"; } diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js index d70a49dba3..d83f0ad241 100644 --- a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js +++ b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js @@ -40,7 +40,7 @@ define(["jQuery", "loading", "events", "globalize", "serverNotifications", "date } html += '
'; html += ""; - html += ''; + html += ''; html += ""; html += '
'; html += ""; @@ -49,9 +49,9 @@ define(["jQuery", "loading", "events", "globalize", "serverNotifications", "date html += ""; html += "
"; if (task.State === "Running") { - html += ''; + html += ''; } else if (task.State === "Idle") { - html += ''; + html += ''; } html += "
"; } @@ -94,7 +94,7 @@ define(["jQuery", "loading", "events", "globalize", "serverNotifications", "date } function setTaskButtonIcon(button, icon) { - var inner = button.querySelector("i"); + var inner = button.querySelector(".material-icons"); inner.classList.remove("stop", "play_arrow"); inner.classList.add(icon); } diff --git a/src/controllers/devices.js b/src/controllers/devices.js index 8dd665f7fa..103b116df4 100644 --- a/src/controllers/devices.js +++ b/src/controllers/devices.js @@ -80,7 +80,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "da deviceHtml += '
"; deviceHtml += "
"; } else { - deviceHtml += ''; + deviceHtml += ''; } deviceHtml += ""; @@ -89,7 +89,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "da if (canEdit || canDelete(device.Id)) { deviceHtml += '
'; - deviceHtml += ''; + deviceHtml += ''; deviceHtml += "
"; } diff --git a/src/controllers/dlnaprofile.js b/src/controllers/dlnaprofile.js index 06c3be74cc..516a97da59 100644 --- a/src/controllers/dlnaprofile.js +++ b/src/controllers/dlnaprofile.js @@ -76,12 +76,12 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in var index = 0; var html = '
' + headers.map(function (h) { var li = '
'; - li += ''; + li += ''; li += '
'; li += '

' + h.Name + ": " + (h.Value || "") + "

"; li += '
' + (h.Match || "") + "
"; li += "
"; - li += ''; + li += ''; li += "
"; index++; return li; @@ -132,11 +132,11 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in function renderXmlDocumentAttributes(page, attribute) { var html = '
' + attribute.map(function (h) { var li = '
'; - li += ''; + li += ''; li += '
'; li += '

' + h.Name + " = " + (h.Value || "") + "

"; li += "
"; - li += ''; + li += ''; return li += "
"; }).join("") + "
"; var elem = $(".xmlDocumentAttributeList", page).html(html).trigger("create"); @@ -174,11 +174,11 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in var index = 0; var html = '
' + profiles.map(function (h) { var li = '
'; - li += ''; + li += ''; li += '
'; li += '

' + (h.Format || "") + "

"; li += "
"; - li += ''; + li += ''; li += "
"; index++; return li; @@ -270,7 +270,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += ''; + html += ''; html += "
"; } @@ -331,7 +331,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += ''; + html += ''; html += "
"; } @@ -415,7 +415,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += ''; + html += ''; html += "
"; } @@ -487,7 +487,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += ''; + html += ''; html += "
"; } @@ -567,7 +567,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += ''; + html += ''; html += "
"; } diff --git a/src/controllers/dlnaprofiles.js b/src/controllers/dlnaprofiles.js index 544ab0d450..c64f39d8b4 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 += ''; + html += ''; html += '
'; html += ""; html += "
" + profile.Name + "
"; @@ -40,7 +40,7 @@ define(["jQuery", "globalize", "loading", "libraryMenu", "listViewStyle", "emby- html += "
"; if ("User" == profile.Type) { - html += ''; + html += ''; } html += "
"; diff --git a/src/controllers/favorites.js b/src/controllers/favorites.js index c06b0bd8fb..dcfdc72bae 100644 --- a/src/controllers/favorites.js +++ b/src/controllers/favorites.js @@ -248,7 +248,7 @@ define(["appRouter", "cardBuilder", "dom", "globalize", "connectionManager", "ap html += '

'; html += globalize.translate(section.name); html += "

"; - html += ''; + html += ''; html += ""; } diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js index 6347aa3802..003d826beb 100644 --- a/src/controllers/itemdetailpage.js +++ b/src/controllers/itemdetailpage.js @@ -1749,7 +1749,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti html += '

'; html += "" + type.name + ""; html += "

"; - html += ''; + html += ''; html += "
"; html += '
'; var shape = "MusicAlbum" == type.type ? getSquareShape(false) : getPortraitShape(false); diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js index 7a8b499217..5ffc380bc6 100644 --- a/src/controllers/livetvstatus.js +++ b/src/controllers/livetvstatus.js @@ -26,11 +26,11 @@ define(["jQuery", "globalize", "scripts/taskbutton", "dom", "libraryMenu", "layo html += '
'; html += '
'; html += '
'; - html += '
'; + html += '
'; html += "
"; html += "
"; html += '
'; - html += ''; + html += ''; html += '
' + (device.FriendlyName || getTunerName(device.Type)) + "
"; html += '
'; html += device.Url || " "; @@ -101,7 +101,7 @@ define(["jQuery", "globalize", "scripts/taskbutton", "dom", "libraryMenu", "layo for (var i = 0, length = providers.length; i < length; i++) { var provider = providers[i]; html += '
'; - html += ''; + html += ''; html += '
'; html += ''; html += '

'; @@ -112,7 +112,7 @@ define(["jQuery", "globalize", "scripts/taskbutton", "dom", "libraryMenu", "layo html += "

"; html += ""; html += "
"; - html += ''; + html += ''; html += "
"; } diff --git a/src/controllers/medialibrarypage.js b/src/controllers/medialibrarypage.js index 956e6e0d9e..497fac3de9 100644 --- a/src/controllers/medialibrarypage.js +++ b/src/controllers/medialibrarypage.js @@ -268,7 +268,7 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl hasCardImageContainer = true; } else if (!virtualFolder.showNameWithIcon) { html += '
'; - html += ''; + html += ''; hasCardImageContainer = true; } @@ -281,7 +281,7 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl if (!imgUrl && virtualFolder.showNameWithIcon) { html += '

'; - html += ''; + html += ''; if (virtualFolder.showNameWithIcon) { html += '
'; @@ -298,7 +298,7 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl if (virtualFolder.showMenu !== false) { html += '
'; - html += ''; + html += ''; html += "
"; } diff --git a/src/controllers/movies/moviegenres.js b/src/controllers/movies/moviegenres.js index bb395f337c..734cc34c44 100644 --- a/src/controllers/movies/moviegenres.js +++ b/src/controllers/movies/moviegenres.js @@ -121,7 +121,7 @@ define(["layoutManager", "loading", "libraryBrowser", "cardBuilder", "lazyLoader }); } if (result.Items.length >= query.Limit) { - tabContent.querySelector(".btnMoreFromGenre" + id + " i").classList.remove("hide"); + tabContent.querySelector(".btnMoreFromGenre" + id + " .material-icons").classList.remove("hide"); } }); } @@ -145,7 +145,7 @@ define(["layoutManager", "loading", "libraryBrowser", "cardBuilder", "lazyLoader html += '

'; html += item.Name; html += "

"; - html += ''; + html += ''; html += ""; html += "
"; if (enableScrollX()) { diff --git a/src/controllers/playback/videoosd.js b/src/controllers/playback/videoosd.js index 150f357b77..ac6f796567 100644 --- a/src/controllers/playback/videoosd.js +++ b/src/controllers/playback/videoosd.js @@ -545,10 +545,10 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med function updateFullscreenIcon() { if (playbackManager.isFullscreen(currentPlayer)) { view.querySelector(".btnFullscreen").setAttribute("title", globalize.translate("ExitFullscreen")); - view.querySelector(".btnFullscreen i").classList.replace("fullscreen", "fullscreen_exit"); + view.querySelector(".btnFullscreen .material-icons").classList.replace("fullscreen", "fullscreen_exit"); } else { view.querySelector(".btnFullscreen").setAttribute("title", globalize.translate("Fullscreen") + " (f)"); - view.querySelector(".btnFullscreen i").classList.replace("fullscreen_exit", "fullscreen"); + view.querySelector(".btnFullscreen .material-icons").classList.replace("fullscreen_exit", "fullscreen"); } } @@ -746,7 +746,7 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med } function updatePlayPauseState(isPaused) { - var button = view.querySelector(".btnPause i"); + var button = view.querySelector(".btnPause .material-icons"); if (isPaused) { button.classList.replace("pause", "play_arrow"); button.setAttribute("title", globalize.translate("ButtonPlay") + " (k)"); @@ -885,10 +885,10 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med if (isMuted) { view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Unmute") + " (m)"); - view.querySelector(".buttonMute i").classList.replace("volume_up", "volume_off"); + view.querySelector(".buttonMute .material-icons").classList.replace("volume_up", "volume_off"); } else { view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Mute") + " (m)"); - view.querySelector(".buttonMute i").classList.replace("volume_off", "volume_up"); + view.querySelector(".buttonMute .material-icons").classList.replace("volume_off", "volume_up"); } if (showMuteButton) { diff --git a/src/controllers/shows/tvgenres.js b/src/controllers/shows/tvgenres.js index 80e2f646b6..d59e7d80c1 100644 --- a/src/controllers/shows/tvgenres.js +++ b/src/controllers/shows/tvgenres.js @@ -121,7 +121,7 @@ define(["layoutManager", "loading", "libraryBrowser", "cardBuilder", "lazyLoader }); } if (result.Items.length >= query.Limit) { - tabContent.querySelector(".btnMoreFromGenre" + id + " i").classList.remove("hide"); + tabContent.querySelector(".btnMoreFromGenre" + id + " .material-icons").classList.remove("hide"); } }); } @@ -144,7 +144,7 @@ define(["layoutManager", "loading", "libraryBrowser", "cardBuilder", "lazyLoader html += '

'; html += item.Name; html += "

"; - html += ''; + html += ''; html += ""; html += "
"; if (enableScrollX()) { diff --git a/src/controllers/userparentalcontrol.js b/src/controllers/userparentalcontrol.js index e3f1705ef5..a26acae51d 100644 --- a/src/controllers/userparentalcontrol.js +++ b/src/controllers/userparentalcontrol.js @@ -108,7 +108,7 @@ define(["jQuery", "datetime", "loading", "libraryMenu", "listViewStyle", "paper- li += h; li += ""; li += "
"; - li += ''; + li += ''; return li += "
"; }).join(""); @@ -143,7 +143,7 @@ define(["jQuery", "datetime", "loading", "libraryMenu", "listViewStyle", "paper- itemHtml += ""; itemHtml += '
' + getDisplayTime(a.StartHour) + " - " + getDisplayTime(a.EndHour) + "
"; itemHtml += "
"; - itemHtml += ''; + itemHtml += ''; itemHtml += "
"; index++; return itemHtml; diff --git a/src/controllers/userprofilespage.js b/src/controllers/userprofilespage.js index b8dbc4fa60..bdd5c6a461 100644 --- a/src/controllers/userprofilespage.js +++ b/src/controllers/userprofilespage.js @@ -104,7 +104,7 @@ define(["loading", "dom", "globalize", "date-fns", "dfnshelper", "paper-icon-but html += '
"; } else { html += '
'; - html += ''; + html += ''; } html += "
"; @@ -115,7 +115,7 @@ define(["loading", "dom", "globalize", "date-fns", "dfnshelper", "paper-icon-but html += '
'; html += user.Name; html += "
"; - html += ''; + html += ''; html += "
"; html += '
'; var lastSeen = getLastSeenText(user.LastActivityDate); @@ -182,14 +182,14 @@ define(["loading", "dom", "globalize", "date-fns", "dfnshelper", "paper-icon-but html += '
"; html += "
"; } else { - html += ''; + html += ''; } html += ""; html += "
"; html += '
'; html += '
'; - html += ''; + html += ''; html += "
"; html += '
'; html += user.UserName; diff --git a/src/dashboard.html b/src/dashboard.html index adb38a9ad3..8be9f54eba 100644 --- a/src/dashboard.html +++ b/src/dashboard.html @@ -5,7 +5,7 @@

${TabServer}

- +
@@ -34,7 +34,7 @@

${HeaderActiveDevices}

- +
@@ -45,7 +45,7 @@

${HeaderActivity}

- +
@@ -62,7 +62,7 @@

${Alerts}

- +
@@ -71,7 +71,7 @@

${HeaderPaths}

- +
diff --git a/src/dashboardgeneral.html b/src/dashboardgeneral.html index f850783f13..59c8e623d7 100644 --- a/src/dashboardgeneral.html +++ b/src/dashboardgeneral.html @@ -39,7 +39,7 @@
- +
${LabelCachePathHelp}
@@ -49,7 +49,7 @@
- +
${LabelMetadataPathHelp}
diff --git a/src/dlnaprofile.html b/src/dlnaprofile.html index 4a5629fd8c..45182fa59e 100644 --- a/src/dlnaprofile.html +++ b/src/dlnaprofile.html @@ -98,7 +98,7 @@

${HeaderHttpHeaders}

@@ -221,7 +221,7 @@

${HeaderXmlDocumentAttributes}

diff --git a/src/dlnaprofiles.html b/src/dlnaprofiles.html index 764ac8e04d..9f2a5e129e 100644 --- a/src/dlnaprofiles.html +++ b/src/dlnaprofiles.html @@ -9,7 +9,7 @@

${HeaderCustomDlnaProfiles}

- + ${Help}
diff --git a/src/elements/emby-button/emby-button.css b/src/elements/emby-button/emby-button.css index a19ce571e2..52520be6d9 100644 --- a/src/elements/emby-button/emby-button.css +++ b/src/elements/emby-button/emby-button.css @@ -58,12 +58,12 @@ text-decoration: underline; } -.emby-button > i { +.emby-button > .material-icons { /* For non-fab buttons that have icons */ font-size: 1.36em; } -.button-link > i { +.button-link > .material-icons { font-size: 1em; } @@ -136,7 +136,7 @@ cursor: default; } -.paper-icon-button-light > i { +.paper-icon-button-light > .material-icons { font-size: 1.66956521739130434em; /* Make sure its on top of the ripple */ diff --git a/src/elements/emby-checkbox/emby-checkbox.js b/src/elements/emby-checkbox/emby-checkbox.js index 8067d33a74..4d02d56163 100644 --- a/src/elements/emby-checkbox/emby-checkbox.js +++ b/src/elements/emby-checkbox/emby-checkbox.js @@ -57,8 +57,8 @@ define(['browser', 'dom', 'css!./emby-checkbox', 'registerElement'], function (b var checkedIcon = this.getAttribute('data-checkedicon') || 'check'; var uncheckedIcon = this.getAttribute('data-uncheckedicon') || ''; - var checkHtml = ''; - var uncheckedHtml = ''; + var checkHtml = ''; + var uncheckedHtml = ''; labelElement.insertAdjacentHTML('beforeend', '' + checkHtml + uncheckedHtml + ''); labelTextElement.classList.add('checkboxLabel'); diff --git a/src/elements/emby-collapse/emby-collapse.js b/src/elements/emby-collapse/emby-collapse.js index fdd77adf0b..707e81a786 100644 --- a/src/elements/emby-collapse/emby-collapse.js +++ b/src/elements/emby-collapse/emby-collapse.js @@ -24,7 +24,7 @@ define(['browser', 'css!./emby-collapse', 'registerElement', 'emby-button'], fun elem.style.height = 'auto'; }, 300); - var icon = button.querySelector('i'); + var icon = button.querySelector('.material-icons'); //icon.innerHTML = 'expand_less'; icon.classList.add('emby-collapse-expandIconExpanded'); } @@ -46,7 +46,7 @@ define(['browser', 'css!./emby-collapse', 'registerElement', 'emby-button'], fun } }, 300); - var icon = button.querySelector('i'); + var icon = button.querySelector('.material-icons'); //icon.innerHTML = 'expand_more'; icon.classList.remove('emby-collapse-expandIconExpanded'); } @@ -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); diff --git a/src/elements/emby-playstatebutton/emby-playstatebutton.js b/src/elements/emby-playstatebutton/emby-playstatebutton.js index 4c3e5b6b62..57f7eb76eb 100644 --- a/src/elements/emby-playstatebutton/emby-playstatebutton.js +++ b/src/elements/emby-playstatebutton/emby-playstatebutton.js @@ -41,7 +41,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby function setState(button, played, updateAttribute) { var icon = button.iconElement; if (!icon) { - button.iconElement = button.querySelector('i'); + button.iconElement = button.querySelector('.material-icons'); icon = button.iconElement; } diff --git a/src/elements/emby-ratingbutton/emby-ratingbutton.js b/src/elements/emby-ratingbutton/emby-ratingbutton.js index 86c31ac871..142920ca15 100644 --- a/src/elements/emby-ratingbutton/emby-ratingbutton.js +++ b/src/elements/emby-ratingbutton/emby-ratingbutton.js @@ -57,7 +57,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby function setState(button, likes, isFavorite, updateAttribute) { - var icon = button.querySelector('i'); + var icon = button.querySelector('.material-icons'); if (isFavorite) { diff --git a/src/elements/emby-scrollbuttons/emby-scrollbuttons.css b/src/elements/emby-scrollbuttons/emby-scrollbuttons.css index 32e60292ad..b2e0d3bc23 100644 --- a/src/elements/emby-scrollbuttons/emby-scrollbuttons.css +++ b/src/elements/emby-scrollbuttons/emby-scrollbuttons.css @@ -12,7 +12,7 @@ display: flex; } -.emby-scrollbuttons-button > i { +.emby-scrollbuttons-button > .material-icons { min-width: 24px; min-height: 24px; display: block; diff --git a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js index 229771b8ed..a4c37384c8 100644 --- a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js +++ b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js @@ -10,7 +10,7 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', ' var icon = direction === 'left' ? 'chevron_left' : 'chevron_right'; html += ''; return html; diff --git a/src/elements/emby-select/emby-select.js b/src/elements/emby-select/emby-select.js index c772c0f960..ea90c4a77d 100644 --- a/src/elements/emby-select/emby-select.js +++ b/src/elements/emby-select/emby-select.js @@ -144,7 +144,7 @@ define(['layoutManager', 'browser', 'actionsheet', 'css!./emby-select', 'registe this.parentNode.insertBefore(label, this); if (this.classList.contains('emby-select-withcolor')) { - this.parentNode.insertAdjacentHTML('beforeend', '
0
'); + this.parentNode.insertAdjacentHTML('beforeend', '
0
'); } }; diff --git a/src/encodingsettings.html b/src/encodingsettings.html index ff064e4373..27cfe404c1 100644 --- a/src/encodingsettings.html +++ b/src/encodingsettings.html @@ -96,7 +96,7 @@
- +
${LabelffmpegPathHelp}
@@ -107,7 +107,7 @@
- +
${LabelTranscodingTempPathHelp}
diff --git a/src/itemdetails.html b/src/itemdetails.html index 5bd8b40de6..37f1432e23 100644 --- a/src/itemdetails.html +++ b/src/itemdetails.html @@ -1,7 +1,7 @@
@@ -17,91 +17,91 @@
diff --git a/src/list.html b/src/list.html index 5e47eeb7fc..efac2d891e 100644 --- a/src/list.html +++ b/src/list.html @@ -7,45 +7,45 @@ ${HeaderPlayAll}
diff --git a/src/livetv.html b/src/livetv.html index 9986529b7f..fdf19bd915 100644 --- a/src/livetv.html +++ b/src/livetv.html @@ -7,7 +7,7 @@

${HeaderOnNow}

- +
@@ -16,7 +16,7 @@

${TabShows}

- +
@@ -25,7 +25,7 @@

${HeaderMovies}

- +
@@ -34,7 +34,7 @@

${Sports}

- +
@@ -43,7 +43,7 @@

${HeaderForKids}

- +
@@ -52,7 +52,7 @@

${News}

- +
@@ -63,7 +63,7 @@
- +
@@ -72,7 +72,7 @@
diff --git a/src/livetvsettings.html b/src/livetvsettings.html index 7c14b68238..bffd6ae4b6 100644 --- a/src/livetvsettings.html +++ b/src/livetvsettings.html @@ -34,7 +34,7 @@
- +
${LabelRecordingPathHelp}
@@ -43,7 +43,7 @@
- +
@@ -51,7 +51,7 @@
- +
@@ -84,7 +84,7 @@
- +
diff --git a/src/livetvstatus.html b/src/livetvstatus.html index c1ae0d4703..cc5f8ae0ba 100644 --- a/src/livetvstatus.html +++ b/src/livetvstatus.html @@ -8,7 +8,7 @@ ${HeaderTunerDevices} ${Help}
@@ -21,7 +21,7 @@

${HeaderGuideProviders}

diff --git a/src/livetvtuner.html b/src/livetvtuner.html index 37d0f8c30f..816d30f340 100644 --- a/src/livetvtuner.html +++ b/src/livetvtuner.html @@ -24,7 +24,7 @@
- +
diff --git a/src/movies.html b/src/movies.html index 7f86e2e0e9..a2221c510d 100644 --- a/src/movies.html +++ b/src/movies.html @@ -3,9 +3,9 @@
- - - + + +
@@ -46,8 +46,8 @@
- - + +
@@ -62,7 +62,7 @@
- +
@@ -74,9 +74,9 @@
- - - + + +
diff --git a/src/music.html b/src/music.html index a42a5bb7f0..1e22ae9f3a 100644 --- a/src/music.html +++ b/src/music.html @@ -37,11 +37,11 @@
- - - - - + + + + +
@@ -56,8 +56,8 @@
- - + +
@@ -72,8 +72,8 @@
- - + +
@@ -92,8 +92,8 @@
- - + +
diff --git a/src/mypreferencesmenu.html b/src/mypreferencesmenu.html index 8e3cd40f6b..2c3ca0edd9 100644 --- a/src/mypreferencesmenu.html +++ b/src/mypreferencesmenu.html @@ -5,7 +5,7 @@

- +
${ButtonProfile}
@@ -14,7 +14,7 @@
- +
${HeaderDisplay}
@@ -23,7 +23,7 @@
- +
${HeaderHome}
@@ -32,7 +32,7 @@
- +
${TitlePlayback}
@@ -41,7 +41,7 @@
- +
${Subtitles}
@@ -50,7 +50,7 @@
- +
${ClientSettings}
@@ -61,7 +61,7 @@

${HeaderAdmin}
- +
${TabDashboard}
@@ -69,7 +69,7 @@
- +
${Metadata}
@@ -80,7 +80,7 @@

${HeaderUser}
- +
${HeaderSelectServer}
@@ -88,7 +88,7 @@
- +
${ButtonSignOut}
diff --git a/src/networking.html b/src/networking.html index f13c9231db..2cb354e7df 100644 --- a/src/networking.html +++ b/src/networking.html @@ -61,7 +61,7 @@
- +
${LabelCustomCertificatePathHelp}
diff --git a/src/nowplaying.html b/src/nowplaying.html index 0982531d9e..f1147b4848 100644 --- a/src/nowplaying.html +++ b/src/nowplaying.html @@ -31,27 +31,27 @@
@@ -59,21 +59,21 @@
@@ -86,43 +86,43 @@



@@ -164,10 +164,10 @@
diff --git a/src/scheduledtask.html b/src/scheduledtask.html index 12b4e3b960..6cfc8ace4b 100644 --- a/src/scheduledtask.html +++ b/src/scheduledtask.html @@ -13,7 +13,7 @@

${HeaderTaskTriggers}

diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js index 22f1aa6125..062bf6f349 100644 --- a/src/scripts/editorsidebar.js +++ b/src/scripts/editorsidebar.js @@ -43,20 +43,20 @@ define(["datetime", "jQuery", "material-icons"], function (datetime, $) { } var htmlName = "
"; if (item.IsFolder) { - htmlName += ''; + htmlName += ''; } else if (item.MediaType === "Video") { - htmlName += ''; + htmlName += ''; } else if (item.MediaType === "Audio") { - htmlName += ''; + htmlName += ''; } else if (item.Type === "TvChannel") { - htmlName += ''; + htmlName += ''; } else if (item.MediaType === "Photo") { - htmlName += ''; + htmlName += ''; } else if (item.MediaType === "Book") { - htmlName += ''; + htmlName += ''; } if (item.LockData) { - htmlName += ''; + htmlName += ''; } htmlName += name; htmlName += "
"; diff --git a/src/scripts/librarybrowser.js b/src/scripts/librarybrowser.js index bc8908fe6c..1ad9b2c82a 100644 --- a/src/scripts/librarybrowser.js +++ b/src/scripts/librarybrowser.js @@ -91,20 +91,20 @@ define(["userSettings"], function (userSettings) { html += '
'; if (showControls) { - html += ''; - html += ''; + html += ''; + html += ''; } if (options.addLayoutButton) { - html += ''; + html += ''; } if (options.sortButton) { - html += ''; + html += ''; } if (options.filterButton) { - html += ''; + html += ''; } html += "
"; diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js index c75dbd01f9..16104eb34e 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -5,17 +5,17 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " var html = ""; html += '
'; html += '
'; - html += ''; - html += ''; - html += ''; + html += ''; + html += ''; + html += ''; html += '

'; html += "
"; html += '
'; html += ''; - html += ''; - html += ''; - html += ''; - html += ''; + html += ''; + html += ''; + html += ''; + html += ''; html += "
"; html += "
"; html += '
'; @@ -102,7 +102,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " headerUserButton.innerHTML = '
"; } else { headerUserButton.classList.remove("headerUserButtonRound"); - headerUserButton.innerHTML = ''; + headerUserButton.innerHTML = ''; } } @@ -217,7 +217,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " function refreshLibraryInfoInDrawer(user, drawer) { var html = ""; html += '
'; - html += '' + globalize.translate("ButtonHome") + ""; + html += '' + globalize.translate("ButtonHome") + ""; // libraries are added here html += '
'; @@ -228,8 +228,8 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " html += '

'; html += globalize.translate("HeaderAdmin"); html += "

"; - html += '' + globalize.translate("TabDashboard") + ""; - html += '' + globalize.translate("Metadata") + ""; + html += '' + globalize.translate("TabDashboard") + ""; + html += '' + globalize.translate("Metadata") + ""; html += "
"; } @@ -240,11 +240,11 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " html += ""; if (appHost.supports("multiserver")) { - html += '' + globalize.translate("ButtonSelectServer") + ""; + html += '' + globalize.translate("ButtonSelectServer") + ""; } - html += '' + globalize.translate("ButtonSettings") + ""; - html += '' + globalize.translate("ButtonSignOut") + ""; + html += '' + globalize.translate("ButtonSettings") + ""; + html += '' + globalize.translate("ButtonSignOut") + ""; html += "
"; } @@ -301,7 +301,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " if (selected) { link.classList.add("navMenuOption-selected"); var title = ""; - link = link.querySelector("span") || link; + link = link.querySelector(".navMenuOptionText") || link; title += (link.innerText || link.textContent).trim(); LibraryMenu.setTitle(title); } else { @@ -452,7 +452,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " menuHtml += '"; if (item.icon) { - menuHtml += ''; + menuHtml += ''; } menuHtml += ''; @@ -579,7 +579,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " i.onclick; } - return '' + i.Name + ""; + return '' + i.Name + ""; }).join(""); libraryMenuOptions.innerHTML = html; var elem = libraryMenuOptions; @@ -614,7 +614,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " function updateCastIcon() { var context = document; var info = playbackManager.getPlayerInfo(); - var icon = headerCastButton.querySelector("i"); + var icon = headerCastButton.querySelector(".material-icons"); if (info && !info.isLocalPlayer) { icon.classList.replace("cast", "cast_connected"); diff --git a/src/tv.html b/src/tv.html index 9a47c6fa8b..ceb5c51b44 100644 --- a/src/tv.html +++ b/src/tv.html @@ -3,9 +3,9 @@
- - - + + +
@@ -59,9 +59,9 @@
- - - + + +
diff --git a/src/userparentalcontrol.html b/src/userparentalcontrol.html index 538de80a70..f320c361f9 100644 --- a/src/userparentalcontrol.html +++ b/src/userparentalcontrol.html @@ -31,7 +31,7 @@

${LabelBlockContentWithTags}

@@ -41,7 +41,7 @@

${HeaderAccessSchedule}

diff --git a/src/userprofiles.html b/src/userprofiles.html index 398d951db2..1eaa1006dc 100644 --- a/src/userprofiles.html +++ b/src/userprofiles.html @@ -6,7 +6,7 @@

${HeaderUsers}

${Help}
diff --git a/src/videoosd.html b/src/videoosd.html index cb1e507541..452c8a9af8 100644 --- a/src/videoosd.html +++ b/src/videoosd.html @@ -8,7 +8,7 @@

- + ${FetchingData}
@@ -25,47 +25,47 @@
@@ -76,7 +76,7 @@
diff --git a/src/wizardfinish.html b/src/wizardfinish.html index 6bcec5ff0a..4d54a10cd4 100644 --- a/src/wizardfinish.html +++ b/src/wizardfinish.html @@ -5,11 +5,11 @@

${WizardCompleted}

diff --git a/src/wizardlibrary.html b/src/wizardlibrary.html index 7851f41f0a..b8a4fab9d5 100644 --- a/src/wizardlibrary.html +++ b/src/wizardlibrary.html @@ -3,7 +3,7 @@

${HeaderSetupLibrary}

- +

@@ -11,12 +11,12 @@
diff --git a/src/wizardremoteaccess.html b/src/wizardremoteaccess.html index c7ddfb7e84..f7ce47dc93 100644 --- a/src/wizardremoteaccess.html +++ b/src/wizardremoteaccess.html @@ -21,12 +21,12 @@
diff --git a/src/wizardsettings.html b/src/wizardsettings.html index f753919478..d4f537cf98 100644 --- a/src/wizardsettings.html +++ b/src/wizardsettings.html @@ -16,12 +16,12 @@
diff --git a/src/wizardstart.html b/src/wizardstart.html index 615feb3b04..c640b8eff8 100644 --- a/src/wizardstart.html +++ b/src/wizardstart.html @@ -20,7 +20,7 @@
diff --git a/src/wizarduser.html b/src/wizarduser.html index 90f492b0fe..3ce0b3ba74 100644 --- a/src/wizarduser.html +++ b/src/wizarduser.html @@ -22,12 +22,12 @@
From 33a6daf6b6391c441a42af03715562b774ac8dc6 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Tue, 28 Apr 2020 17:50:34 +0300 Subject: [PATCH 4/6] Update loop --- src/components/nowplayingbar/nowplayingbar.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/components/nowplayingbar/nowplayingbar.js b/src/components/nowplayingbar/nowplayingbar.js index bfae96b027..10d7d508da 100644 --- a/src/components/nowplayingbar/nowplayingbar.js +++ b/src/components/nowplayingbar/nowplayingbar.js @@ -134,12 +134,10 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', } }); - var i; - var length; playPauseButtons = elem.querySelectorAll('.playPauseButton'); - for (i = 0, length = playPauseButtons.length; i < length; i++) { - playPauseButtons[i].addEventListener('click', onPlayPauseClick); - } + playPauseButtons.forEach((button) => { + button.addEventListener('click', onPlayPauseClick); + }); elem.querySelector('.nextTrackButton').addEventListener('click', function () { @@ -281,16 +279,13 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', } function updatePlayPauseState(isPaused) { - var i; - var length; - if (playPauseButtons) { let icons = ["play_arrow", "pause"]; if (isPaused) icons = icons.reverse(); - for (i = 0, length = playPauseButtons.length; i < length; i++) { - playPauseButtons[i].querySelector('.material-icons').classList.replace(icons[0], icons[1]); - } + playPauseButtons.forEach((button) => { + button.querySelector('.material-icons').classList.replace(icons[0], icons[1]); + }); } } From 6a258c055be1a02eada0c0ce0548677081481156 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Tue, 28 Apr 2020 18:02:29 +0300 Subject: [PATCH 5/6] Update quotes style --- src/components/nowplayingbar/nowplayingbar.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/nowplayingbar/nowplayingbar.js b/src/components/nowplayingbar/nowplayingbar.js index 10d7d508da..2f44e31986 100644 --- a/src/components/nowplayingbar/nowplayingbar.js +++ b/src/components/nowplayingbar/nowplayingbar.js @@ -280,7 +280,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', function updatePlayPauseState(isPaused) { if (playPauseButtons) { - let icons = ["play_arrow", "pause"]; + let icons = ['play_arrow', 'pause']; if (isPaused) icons = icons.reverse(); playPauseButtons.forEach((button) => { @@ -329,16 +329,16 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', } function updateRepeatModeDisplay(repeatMode) { - toggleRepeatButtonIcon.classList.remove("repeat", "repeat_one"); + toggleRepeatButtonIcon.classList.remove('repeat', 'repeat_one'); if (repeatMode === 'RepeatAll') { - toggleRepeatButtonIcon.classList.add("repeat"); + toggleRepeatButtonIcon.classList.add('repeat'); toggleRepeatButton.classList.add('repeatButton-active'); } else if (repeatMode === 'RepeatOne') { - toggleRepeatButtonIcon.classList.add("repeat_one"); + toggleRepeatButtonIcon.classList.add('repeat_one'); toggleRepeatButton.classList.add('repeatButton-active'); } else { - toggleRepeatButtonIcon.classList.add("repeat"); + toggleRepeatButtonIcon.classList.add('repeat'); toggleRepeatButton.classList.remove('repeatButton-active'); } } @@ -387,7 +387,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', showMuteButton = false; } - let icons = ["volume_off", "volume_up"]; + let icons = ['volume_off', 'volume_up']; if (isMuted) icons = icons.reverse(); muteButton.querySelector('.material-icons').classList.replace(icons[0], icons[1]); From a3bc8c183ef7f693045e215c5fbad73dea2fee43 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sat, 2 May 2020 14:02:44 +0300 Subject: [PATCH 6/6] Use remove+add pattern for icons --- src/components/nowplayingbar/nowplayingbar.js | 13 +++--- src/components/playback/volumeosd.js | 5 +-- src/components/remotecontrol/remotecontrol.js | 25 +++++++---- src/components/tabbedview/itemstab.js | 5 +-- src/controllers/dashboard/dashboard.js | 6 +-- src/controllers/playback/videoosd.js | 44 ++++++++++++------- src/scripts/librarymenu.js | 6 ++- 7 files changed, 62 insertions(+), 42 deletions(-) diff --git a/src/components/nowplayingbar/nowplayingbar.js b/src/components/nowplayingbar/nowplayingbar.js index 2f44e31986..0b369f1f3c 100644 --- a/src/components/nowplayingbar/nowplayingbar.js +++ b/src/components/nowplayingbar/nowplayingbar.js @@ -280,11 +280,10 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', function updatePlayPauseState(isPaused) { if (playPauseButtons) { - let icons = ['play_arrow', 'pause']; - if (isPaused) icons = icons.reverse(); - playPauseButtons.forEach((button) => { - button.querySelector('.material-icons').classList.replace(icons[0], icons[1]); + const icon = button.querySelector('.material-icons'); + icon.classList.remove('play_arrow', 'pause'); + icon.classList.add(isPaused ? 'play_arrow' : 'pause'); }); } } @@ -387,9 +386,9 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', showMuteButton = false; } - let icons = ['volume_off', 'volume_up']; - if (isMuted) icons = icons.reverse(); - muteButton.querySelector('.material-icons').classList.replace(icons[0], icons[1]); + const muteButtonIcon = muteButton.querySelector('.material-icons'); + muteButtonIcon.classList.remove('volume_off', 'volume_up'); + muteButtonIcon.classList.add(isMuted ? 'volume_off' : 'volume_up'); if (supportedCommands.indexOf('SetVolume') === -1) { showVolumeSlider = false; diff --git a/src/components/playback/volumeosd.js b/src/components/playback/volumeosd.js index ab124ab22b..95a13d769d 100644 --- a/src/components/playback/volumeosd.js +++ b/src/components/playback/volumeosd.js @@ -101,9 +101,8 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia function updatePlayerVolumeState(isMuted, volume) { if (iconElement) { - let icons = ["volume_off", "volume_up"]; - if (isMuted) icons = icons.reverse(); - iconElement.classList.replace(icons[0], icons[1]); + iconElement.classList.remove('volume_off', 'volume_up'); + iconElement.classList.add(isMuted ? 'volume_off' : 'volume_up'); } if (progressElement) { progressElement.style.width = (volume || 0) + '%'; diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js index 3f3c4d1f1d..a9f0a4550f 100644 --- a/src/components/remotecontrol/remotecontrol.js +++ b/src/components/remotecontrol/remotecontrol.js @@ -349,18 +349,23 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL showVolumeSlider = false; } + const buttonMute = view.querySelector(".buttonMute"); + const buttonMuteIcon = buttonMute.querySelector(".material-icons"); + + buttonMuteIcon.classList.remove("volume_off", "volume_up"); + if (isMuted) { - view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Unmute")); - view.querySelector(".buttonMute .material-icons").classList.replace("volume_up", "volume_off"); + buttonMute.setAttribute("title", globalize.translate("Unmute")); + buttonMuteIcon.classList.add("volume_off"); } else { - view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Mute")); - view.querySelector(".buttonMute .material-icons").classList.replace("volume_off", "volume_up"); + buttonMute.setAttribute("title", globalize.translate("Mute")); + buttonMuteIcon.classList.add("volume_up"); } if (showMuteButton) { - view.querySelector(".buttonMute").classList.remove("hide"); + buttonMute.classList.remove("hide"); } else { - view.querySelector(".buttonMute").classList.add("hide"); + buttonMute.classList.add("hide"); } var nowPlayingVolumeSlider = context.querySelector(".nowPlayingVolumeSlider"); @@ -382,9 +387,11 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL function updatePlayPauseState(isPaused, isActive) { var context = dlg; var btnPlayPause = context.querySelector(".btnPlayPause"); - let icons = ["play_circle_filled", "pause_circle_filled"]; - if (isPaused) icons = icons.reverse(); - btnPlayPause.querySelector(".material-icons").classList.replace(icons[0], icons[1]); + const btnPlayPauseIcon = btnPlayPause.querySelector(".material-icons"); + + btnPlayPauseIcon.classList.remove("play_circle_filled", "pause_circle_filled"); + btnPlayPauseIcon.classList.add(isPaused ? "play_circle_filled" : "pause_circle_filled"); + buttonVisible(btnPlayPause, isActive); } diff --git a/src/components/tabbedview/itemstab.js b/src/components/tabbedview/itemstab.js index 26da63c894..884cfa2015 100644 --- a/src/components/tabbedview/itemstab.js +++ b/src/components/tabbedview/itemstab.js @@ -181,9 +181,8 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts return; } - let icons = ["arrow_downward", "arrow_upward"]; - if (values.sortOrder === 'Descending') icons = icons.reverse(); - btnSortIcon.classList.replace(icons[0], icons[1]); + btnSortIcon.classList.remove('arrow_downward', 'arrow_upward'); + btnSortIcon.classList.add(values.sortOrder === 'Descending' ? 'arrow_downward' : 'arrow_upward'); } function bindAll(elems, eventName, fn) { diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js index ed16d90a38..6dd1ceae28 100644 --- a/src/controllers/dashboard/dashboard.js +++ b/src/controllers/dashboard/dashboard.js @@ -571,9 +571,9 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa row.querySelector(".btnSessionStop").classList.add("hide"); } - let icons = ["play_arrow", "pause"]; - if (session.PlayState && session.PlayState.IsPaused) icons = icons.reverse(); - btnSessionPlayPause.querySelector(".material-icons").classList.replace(icons[0], icons[1]); + const btnSessionPlayPauseIcon = btnSessionPlayPause.querySelector(".material-icons"); + btnSessionPlayPauseIcon.classList.remove("play_arrow", "pause"); + btnSessionPlayPauseIcon.classList.add(session.PlayState && session.PlayState.IsPaused ? "play_arrow" : "pause"); row.querySelector(".sessionNowPlayingStreamInfo").innerHTML = DashboardPage.getSessionNowPlayingStreamInfo(session); row.querySelector(".sessionNowPlayingTime").innerHTML = DashboardPage.getSessionNowPlayingTime(session); diff --git a/src/controllers/playback/videoosd.js b/src/controllers/playback/videoosd.js index ac6f796567..55c338b92f 100644 --- a/src/controllers/playback/videoosd.js +++ b/src/controllers/playback/videoosd.js @@ -543,12 +543,17 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med } function updateFullscreenIcon() { + const button = view.querySelector(".btnFullscreen"); + const icon = button.querySelector(".material-icons"); + + icon.classList.remove("fullscreen_exit", "fullscreen"); + if (playbackManager.isFullscreen(currentPlayer)) { - view.querySelector(".btnFullscreen").setAttribute("title", globalize.translate("ExitFullscreen")); - view.querySelector(".btnFullscreen .material-icons").classList.replace("fullscreen", "fullscreen_exit"); + button.setAttribute("title", globalize.translate("ExitFullscreen") + " (f)"); + icon.classList.add("fullscreen_exit"); } else { - view.querySelector(".btnFullscreen").setAttribute("title", globalize.translate("Fullscreen") + " (f)"); - view.querySelector(".btnFullscreen .material-icons").classList.replace("fullscreen_exit", "fullscreen"); + button.setAttribute("title", globalize.translate("Fullscreen") + " (f)"); + icon.classList.add("fullscreen"); } } @@ -746,13 +751,17 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med } function updatePlayPauseState(isPaused) { - var button = view.querySelector(".btnPause .material-icons"); + const btnPlayPause = view.querySelector(".btnPause"); + const btnPlayPauseIcon = btnPlayPause.querySelector(".material-icons"); + + btnPlayPauseIcon.classList.remove("play_arrow", "pause"); + if (isPaused) { - button.classList.replace("pause", "play_arrow"); - button.setAttribute("title", globalize.translate("ButtonPlay") + " (k)"); + btnPlayPauseIcon.classList.add("play_arrow"); + btnPlayPause.setAttribute("title", globalize.translate("ButtonPlay") + " (k)"); } else { - button.classList.replace("play_arrow", "pause"); - button.setAttribute("title", globalize.translate("ButtonPause") + " (k)"); + btnPlayPauseIcon.classList.add("pause"); + btnPlayPause.setAttribute("title", globalize.translate("ButtonPause") + " (k)"); } } @@ -883,18 +892,23 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med showVolumeSlider = false; } + const buttonMute = view.querySelector(".buttonMute"); + const buttonMuteIcon = buttonMute.querySelector(".material-icons"); + + buttonMuteIcon.classList.remove("volume_off", "volume_up"); + if (isMuted) { - view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Unmute") + " (m)"); - view.querySelector(".buttonMute .material-icons").classList.replace("volume_up", "volume_off"); + buttonMute.setAttribute("title", globalize.translate("Unmute") + " (m)"); + buttonMuteIcon.classList.add("volume_off"); } else { - view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Mute") + " (m)"); - view.querySelector(".buttonMute .material-icons").classList.replace("volume_off", "volume_up"); + buttonMute.setAttribute("title", globalize.translate("Mute") + " (m)"); + buttonMuteIcon.classList.add("volume_up"); } if (showMuteButton) { - view.querySelector(".buttonMute").classList.remove("hide"); + buttonMute.classList.remove("hide"); } else { - view.querySelector(".buttonMute").classList.add("hide"); + buttonMute.classList.add("hide"); } if (nowPlayingVolumeSlider) { diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js index 16104eb34e..fbc641b741 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -616,12 +616,14 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " var info = playbackManager.getPlayerInfo(); var icon = headerCastButton.querySelector(".material-icons"); + icon.classList.remove("cast_connected", "cast"); + if (info && !info.isLocalPlayer) { - icon.classList.replace("cast", "cast_connected"); + icon.classList.add("cast_connected"); headerCastButton.classList.add("castButton-active"); context.querySelector(".headerSelectedPlayer").innerHTML = info.deviceName || info.name; } else { - icon.classList.replace("cast_connected", "cast"); + icon.classList.add("cast"); headerCastButton.classList.remove("castButton-active"); context.querySelector(".headerSelectedPlayer").innerHTML = ""; }