diff --git a/dashboard-ui/autoorganizetv.html b/dashboard-ui/autoorganizetv.html index f995a81f27..f5646f5413 100644 --- a/dashboard-ui/autoorganizetv.html +++ b/dashboard-ui/autoorganizetv.html @@ -30,21 +30,17 @@
${LabelWatchFolderHelp}
-
  • - - +
    ${LabelMinFileSizeForOrganizeHelp}
  • - - +
  • - - +
    • @@ -52,14 +48,12 @@

    - - +

    - - +
    @@ -143,7 +137,7 @@
    -
    +
    diff --git a/dashboard-ui/components/metadataeditor/personeditor.js b/dashboard-ui/components/metadataeditor/personeditor.js index e33e75673c..6e20fa4209 100644 --- a/dashboard-ui/components/metadataeditor/personeditor.js +++ b/dashboard-ui/components/metadataeditor/personeditor.js @@ -12,7 +12,7 @@ var template = this.response; var dlg = paperDialogHelper.createDialog({ removeOnClose: true, - size: 'small' + size: 'medium' }); dlg.classList.add('ui-body-b'); @@ -28,9 +28,9 @@ dlg.innerHTML = html; document.body.appendChild(dlg); - $('#txtPersonName', dlg).val(person.Name || ''); - $('#selectPersonType', dlg).val(person.Type || ''); - $('#txtPersonRole', dlg).val(person.Role || ''); + $('.txtPersonName', dlg).val(person.Name || ''); + $('.selectPersonType', dlg).val(person.Type || ''); + $('.txtPersonRole', dlg).val(person.Role || ''); paperDialogHelper.open(dlg); @@ -52,9 +52,9 @@ submitted = true; - person.Name = $('#txtPersonName', dlg).val(); - person.Type = $('#selectPersonType', dlg).val(); - person.Role = $('#txtPersonRole', dlg).val() || null; + person.Name = $('.txtPersonName', dlg).val(); + person.Type = $('.selectPersonType', dlg).val(); + person.Role = $('.txtPersonRole', dlg).val() || null; paperDialogHelper.close(dlg); diff --git a/dashboard-ui/components/metadataeditor/personeditor.template.html b/dashboard-ui/components/metadataeditor/personeditor.template.html index 7fe50e5a40..cf8fb5d601 100644 --- a/dashboard-ui/components/metadataeditor/personeditor.template.html +++ b/dashboard-ui/components/metadataeditor/personeditor.template.html @@ -8,13 +8,13 @@
    - +

    - @@ -25,7 +25,7 @@
    - +
    ${LabelPersonRoleHelp}

    diff --git a/dashboard-ui/components/remotecontrol.js b/dashboard-ui/components/remotecontrol.js index c4bdb1d877..2dc01a8f77 100644 --- a/dashboard-ui/components/remotecontrol.js +++ b/dashboard-ui/components/remotecontrol.js @@ -551,15 +551,18 @@ function updateCastIcon(context) { var info = MediaController.getPlayerInfo(); + var btnCast = context.querySelector('.nowPlayingCastIcon'); if (info.isLocalPlayer) { - context.querySelector('.nowPlayingCastIcon').icon = 'cast'; + btnCast.icon = 'cast'; + btnCast.classList.remove('btnActiveCast'); context.querySelector('.nowPlayingSelectedPlayer').innerHTML = ''; } else { - context.querySelector('.nowPlayingCastIcon').icon = 'cast-connected'; + btnCast.icon = 'cast-connected'; + btnCast.classList.add('btnActiveCast'); context.querySelector('.nowPlayingSelectedPlayer').innerHTML = info.deviceName || info.name; } } diff --git a/dashboard-ui/dlnasettings.html b/dashboard-ui/dlnasettings.html index cd55188d6f..e9a896481b 100644 --- a/dashboard-ui/dlnasettings.html +++ b/dashboard-ui/dlnasettings.html @@ -4,7 +4,7 @@ ${TitleDlna} -
    +
    @@ -19,14 +19,12 @@
    • - - -
      ${LabelEnableDlnaPlayToHelp}
      + ${LabelEnableDlnaPlayTo} +
      ${LabelEnableDlnaPlayToHelp}
    • - - -
      ${LabelEnableDlnaDebugLoggingHelp}
      + ${LabelEnableDlnaDebugLogging} +
      ${LabelEnableDlnaDebugLoggingHelp}
    • diff --git a/dashboard-ui/scripts/autoorganizesmart.js b/dashboard-ui/scripts/autoorganizesmart.js index 10b0413cb5..7a922e83d2 100644 --- a/dashboard-ui/scripts/autoorganizesmart.js +++ b/dashboard-ui/scripts/autoorganizesmart.js @@ -19,8 +19,11 @@ populateList(page, infos); Dashboard.hideLoadingMsg(); - }, onApiFailure); + }, function () { + + Dashboard.hideLoadingMsg(); + }); } function populateList(page, result) { @@ -55,8 +58,7 @@ if (info.OrganizerType != currentType) { currentType = info.OrganizerType; - if (html.length > 0) - { + if (html.length > 0) { html += "
    "; } @@ -74,7 +76,7 @@ html += "

    " + info.MatchStrings[n] + "

    "; - html += "" + Globalize.translate('ButtonDelete') + ""; + html += "" + Globalize.translate('ButtonDelete') + ""; html += ""; @@ -92,8 +94,7 @@ Dashboard.hideLoadingMsg(); Dashboard.alert({ - title: Globalize.translate('AutoOrganizeError'), - message: Globalize.translate('ErrorOrganizingFileWithErrorCode', e.getResponseHeader("X-Application-Error-Code")) + message: Globalize.translate('DefaultErrorMessage') }); } diff --git a/dashboard-ui/scripts/dlnasettings.js b/dashboard-ui/scripts/dlnasettings.js index d922a329c9..4001b825ac 100644 --- a/dashboard-ui/scripts/dlnasettings.js +++ b/dashboard-ui/scripts/dlnasettings.js @@ -2,8 +2,9 @@ function loadPage(page, config) { - $('#chkEnablePlayTo', page).checked(config.EnablePlayTo).checkboxradio("refresh"); - $('#chkEnableDlnaDebugLogging', page).checked(config.EnableDebugLogging).checkboxradio("refresh"); + page.querySelector('#chkEnablePlayTo').checked = config.EnablePlayTo; + page.querySelector('#chkEnableDlnaDebugLogging').checked = config.EnableDebugLogging; + $('#txtClientDiscoveryInterval', page).val(config.ClientDiscoveryIntervalSeconds); Dashboard.hideLoadingMsg(); @@ -17,8 +18,9 @@ ApiClient.getNamedConfiguration("dlna").then(function (config) { - config.EnablePlayTo = $('#chkEnablePlayTo', form).checked(); - config.EnableDebugLogging = $('#chkEnableDlnaDebugLogging', form).checked(); + config.EnablePlayTo = form.querySelector('#chkEnablePlayTo').checked; + config.EnableDebugLogging = form.querySelector('#chkEnableDlnaDebugLogging').checked; + config.ClientDiscoveryIntervalSeconds = $('#txtClientDiscoveryInterval', form).val(); ApiClient.updateNamedConfiguration("dlna", config).then(Dashboard.processServerConfigurationUpdateResult); diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js index 7a42e3d5b4..4181a4dd4a 100644 --- a/dashboard-ui/scripts/encodingsettings.js +++ b/dashboard-ui/scripts/encodingsettings.js @@ -2,7 +2,6 @@ function loadPage(page, config) { - $('#chkEnableDebugEncodingLogging', page).checked(config.EnableDebugLogging).checkboxradio('refresh'); page.querySelector('#chkEnableThrottle').checked = config.EnableThrottling; $('.radioEncodingQuality', page).each(function () { @@ -28,7 +27,6 @@ ApiClient.getNamedConfiguration("encoding").then(function (config) { - config.EnableDebugLogging = $('#chkEnableDebugEncodingLogging', form).checked(); config.EncodingQuality = $('.radioEncodingQuality:checked', form).val(); config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val(); config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val(); diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 4f9c547e25..4cacfc8174 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -674,22 +674,24 @@ function updateCastIcon() { + var context = document; + + var btnCast = context.querySelector('.btnCast'); + var info = MediaController.getPlayerInfo(); if (info.isLocalPlayer) { - $('.btnCast').removeClass('btnActiveCast').each(function () { - this.icon = 'cast'; - }); - $('.headerSelectedPlayer').html(''); + btnCast.icon = 'cast'; + btnCast.classList.remove('btnActiveCast'); + + context.querySelector('.headerSelectedPlayer').innerHTML = ''; } else { - $('.btnCast').addClass('btnActiveCast').each(function () { - this.icon = 'cast-connected'; - }); - - $('.headerSelectedPlayer').html((info.deviceName || info.name)); + btnCast.icon = 'cast-connected'; + btnCast.classList.add('btnActiveCast'); + context.querySelector('.headerSelectedPlayer').innerHTML = info.deviceName || info.name; } } @@ -792,6 +794,21 @@ } } + pageClassOn('pageinit', 'page', function () { + + var page = this; + + var isLibraryPage = page.classList.contains('libraryPage'); + + if (isLibraryPage) { + + var navs = page.querySelectorAll('.libraryViewNav'); + for (var i = 0, length = navs.length; i < length; i++) { + initHeadRoom(navs[i]); + } + } + }); + pageClassOn('pagebeforeshow', 'page', function () { var page = this; @@ -823,11 +840,6 @@ document.body.classList.add('libraryDocument'); document.body.classList.remove('dashboardDocument'); document.body.classList.remove('hideMainDrawer'); - - var navs = page.querySelectorAll('.libraryViewNav'); - for (var i = 0, length = navs.length; i < length; i++) { - initHeadRoom(navs[i]); - } } else if (page.classList.contains('type-interior')) { diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js index f12d36e3fb..8846db6faf 100644 --- a/dashboard-ui/scripts/mediacontroller.js +++ b/dashboard-ui/scripts/mediacontroller.js @@ -64,7 +64,7 @@ }); } - function showPlayerSelection(button) { + function showPlayerSelection(button, enableHistory) { var playerInfo = MediaController.getPlayerInfo(); @@ -101,6 +101,7 @@ title: Globalize.translate('HeaderSelectPlayer'), items: menuItems, positionTo: button, + enableHistory: enableHistory !== false, callback: function (id) { var target = targets.filter(function (t) { diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index 690ebfbeab..30ff85db82 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -743,6 +743,7 @@ html += ''; + html += ''; html += ''; html += ''; //html += ''; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index eaaaab12e2..28cb97ebee 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1640,7 +1640,7 @@ var AppInfo = {}; function initializeApiClient(apiClient) { if (AppInfo.enableAppStorePolicy) { - apiClient.getAvailablePlugins = function() { + apiClient.getAvailablePlugins = function () { return Promise.resolve([]); }; apiClient.getInstalledPlugins = function () {