diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 0bd2a1ebbe..2c50782636 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -15,12 +15,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.17", - "_release": "1.4.17", + "version": "1.4.18", + "_release": "1.4.18", "_resolution": { "type": "version", - "tag": "1.4.17", - "commit": "26ee95baf54887c88d2aadf768ded7aa75a65fb7" + "tag": "1.4.18", + "commit": "39d5a6a55acf536c14945385fbce917516fe23ea" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js b/dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js index 73d71c4da2..f40c82f1be 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js +++ b/dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js @@ -57,13 +57,14 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser var self = {}; var enableFade = browser.animate && !browser.mobile && !browser.operaTv; + function fillImage(elem, source, enableEffects) { if (!source) { source = elem.getAttribute('data-src'); } if (source) { - if (enableFade && enableEffects !== false) { + if (enableFade && !layoutManager.tv && enableEffects !== false) { imageFetcher.loadImage(elem, source).then(fadeIn); } else { imageFetcher.loadImage(elem, source); diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/da.json b/dashboard-ui/bower_components/emby-webcomponents/strings/da.json index d3be52064a..d6abbd58ac 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/da.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/da.json @@ -70,7 +70,7 @@ "LabelPlaylist": "Playlist:", "AddToPlaylist": "Add to Playlist", "Subtitles": "Subtitles", - "DownloadSubtitles": "Download Subtitles", + "SearchForSubtitles": "Search for Subtitles", "LabelLanguage": "Language:", "Search": "Search", "NoSubtitleSearchResultsFound": "No results found.", diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/de.json b/dashboard-ui/bower_components/emby-webcomponents/strings/de.json index a596c502bf..8e130c838c 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/de.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/de.json @@ -70,7 +70,7 @@ "LabelPlaylist": "Wiedergabeliste", "AddToPlaylist": "Zur Wiedergabeliste hinzuf\u00fcgen", "Subtitles": "Subtitles", - "DownloadSubtitles": "Download Subtitles", + "SearchForSubtitles": "Search for Subtitles", "LabelLanguage": "Language:", "Search": "Search", "NoSubtitleSearchResultsFound": "No results found.", diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json b/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json index b5ae27c2eb..fb3f41f261 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json @@ -70,7 +70,7 @@ "LabelPlaylist": "Lista de Reproducci\u00f3n:", "AddToPlaylist": "Agregar a lista de reproducci\u00f3n", "Subtitles": "Subtitles", - "DownloadSubtitles": "Download Subtitles", + "SearchForSubtitles": "Search for Subtitles", "LabelLanguage": "Language:", "Search": "Search", "NoSubtitleSearchResultsFound": "No results found.", diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json b/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json index 3300d24f8a..08c2d402b7 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json @@ -69,15 +69,15 @@ "OptionNew": "\u0416\u0430\u04a3\u0430...", "LabelPlaylist": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0456:", "AddToPlaylist": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0456\u043d\u0435 \u04af\u0441\u0442\u0435\u0443", - "Subtitles": "Subtitles", - "DownloadSubtitles": "Download Subtitles", - "LabelLanguage": "Language:", - "Search": "Search", - "NoSubtitleSearchResultsFound": "No results found.", - "File": "File", - "MessageAreYouSureDeleteSubtitles": "Are you sure you wish to delete this subtitle file?", - "ConfirmDeletion": "Confirm Deletion", - "MySubtitles": "My Subtitles", - "MessageDownloadQueued": "Download queued.", - "EditSubtitles": "Edit Subtitles" + "Subtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440", + "SearchForSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440\u0434\u0456 \u0456\u0437\u0434\u0435\u0443", + "LabelLanguage": "\u0422\u0456\u043b:", + "Search": "\u0406\u0437\u0434\u0435\u0443", + "NoSubtitleSearchResultsFound": "\u0415\u0448\u049b\u0430\u043d\u0434\u0430\u0439 \u043d\u04d9\u0442\u0438\u0436\u0435\u043b\u0435\u0440 \u0442\u0430\u0431\u044b\u043b\u043c\u0430\u0434\u044b.", + "File": "\u0424\u0430\u0439\u043b", + "MessageAreYouSureDeleteSubtitles": "\u0428\u044b\u043d\u044b\u043c\u0435\u043d \u043e\u0441\u044b \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 \u0444\u0430\u0439\u043b\u044b\u043d \u0436\u043e\u044e \u049b\u0430\u0436\u0435\u0442 \u043f\u0435?", + "ConfirmDeletion": "\u0416\u043e\u044e\u0434\u044b \u0440\u0430\u0441\u0442\u0430\u0443", + "MySubtitles": "\u041c\u0435\u043d\u0456\u04a3 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440\u0456\u043c", + "MessageDownloadQueued": "\u0416\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443 \u043a\u0435\u0437\u0435\u043a\u0442\u0435.", + "EditSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440\u0434\u0456 \u04e9\u04a3\u0434\u0435\u0443" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/nb.json b/dashboard-ui/bower_components/emby-webcomponents/strings/nb.json index 6a11191ab8..385100dd9c 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/nb.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/nb.json @@ -70,7 +70,7 @@ "LabelPlaylist": "Spilleliste:", "AddToPlaylist": "Legg til i Spilleliste", "Subtitles": "Subtitles", - "DownloadSubtitles": "Download Subtitles", + "SearchForSubtitles": "Search for Subtitles", "LabelLanguage": "Language:", "Search": "Search", "NoSubtitleSearchResultsFound": "No results found.", diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json b/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json index 75504336ea..ba06032d26 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json @@ -70,7 +70,7 @@ "LabelPlaylist": "Playlist:", "AddToPlaylist": "Add to Playlist", "Subtitles": "Subtitles", - "DownloadSubtitles": "Download Subtitles", + "SearchForSubtitles": "Search for Subtitles", "LabelLanguage": "Language:", "Search": "Search", "NoSubtitleSearchResultsFound": "No results found.", diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/pt-BR.json b/dashboard-ui/bower_components/emby-webcomponents/strings/pt-BR.json index 562d2e339e..b710dcc315 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/pt-BR.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/pt-BR.json @@ -70,7 +70,7 @@ "LabelPlaylist": "Lista de Reprodu\u00e7\u00e3o:", "AddToPlaylist": "Adicionar \u00e0 lista de reprodu\u00e7\u00e3o", "Subtitles": "Subtitles", - "DownloadSubtitles": "Download Subtitles", + "SearchForSubtitles": "Search for Subtitles", "LabelLanguage": "Language:", "Search": "Search", "NoSubtitleSearchResultsFound": "No results found.", diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json index d6c99c2084..995169a51d 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json @@ -69,15 +69,15 @@ "OptionNew": "\u041d\u043e\u0432\u043e\u0435...", "LabelPlaylist": "\u041f\u043b\u0435\u0439-\u043b\u0438\u0441\u0442:", "AddToPlaylist": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u043f\u043b\u0435\u0439-\u043b\u0438\u0441\u0442", - "Subtitles": "Subtitles", - "DownloadSubtitles": "Download Subtitles", - "LabelLanguage": "Language:", - "Search": "Search", - "NoSubtitleSearchResultsFound": "No results found.", - "File": "File", - "MessageAreYouSureDeleteSubtitles": "Are you sure you wish to delete this subtitle file?", - "ConfirmDeletion": "Confirm Deletion", - "MySubtitles": "My Subtitles", - "MessageDownloadQueued": "Download queued.", - "EditSubtitles": "Edit Subtitles" + "Subtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b", + "SearchForSubtitles": "\u041f\u043e\u0438\u0441\u043a \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043e\u0432", + "LabelLanguage": "\u042f\u0437\u044b\u043a:", + "Search": "\u041f\u043e\u0438\u0441\u043a", + "NoSubtitleSearchResultsFound": "\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e.", + "File": "\u0424\u0430\u0439\u043b", + "MessageAreYouSureDeleteSubtitles": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0439 \u0444\u0430\u0439\u043b \u0441\u0443\u0431\u0438\u0442\u0440\u043e\u0432?", + "ConfirmDeletion": "\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f", + "MySubtitles": "\u041c\u043e\u0438 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044b", + "MessageDownloadQueued": "\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0432 \u043e\u0447\u0435\u0440\u0435\u0434\u0438.", + "EditSubtitles": "\u041f\u0440\u0430\u0432\u0438\u0442\u044c \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044b" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/polymer/polymer.html b/dashboard-ui/bower_components/polymer/polymer.html index 89447b46db..0f28f2241c 100644 --- a/dashboard-ui/bower_components/polymer/polymer.html +++ b/dashboard-ui/bower_components/polymer/polymer.html @@ -770,7 +770,7 @@ prevent = dy > dx; prevent = dx > dy; } if (prevent) { -//ev.preventDefault(); +ev.preventDefault(); } else { Gestures.prevent('track'); } diff --git a/dashboard-ui/librarydisplay.html b/dashboard-ui/librarydisplay.html index a133e3dec9..e1dc482c7b 100644 --- a/dashboard-ui/librarydisplay.html +++ b/dashboard-ui/librarydisplay.html @@ -1,4 +1,4 @@ -
+
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html index f6cbec2cb4..bca0ee844e 100644 --- a/dashboard-ui/librarysettings.html +++ b/dashboard-ui/librarysettings.html @@ -1,4 +1,4 @@ -
+
diff --git a/dashboard-ui/scripts/librarysettings.js b/dashboard-ui/scripts/librarysettings.js index ff78e8db92..32e8da193c 100644 --- a/dashboard-ui/scripts/librarysettings.js +++ b/dashboard-ui/scripts/librarysettings.js @@ -146,41 +146,11 @@ }]; } - $(document).on('pageshow', "#librarySettingsPage", function () { + return function (view, params) { - LibraryMenu.setTabs('librarysetup', 3, getTabs); - Dashboard.showLoadingMsg(); + var self = this; - var page = this; - - ApiClient.getServerConfiguration().then(function (config) { - - loadPage(page, config); - }); - - ApiClient.getNamedConfiguration("metadata").then(function (metadata) { - - loadMetadataConfig(page, metadata); - }); - - ApiClient.getNamedConfiguration("fanart").then(function (metadata) { - - loadFanartConfig(page, metadata); - }); - - var promise1 = ApiClient.getNamedConfiguration("chapters"); - var promise2 = ApiClient.getJSON(ApiClient.getUrl("Providers/Chapters")); - - Promise.all([promise1, promise2]).then(function (responses) { - - loadChapters(page, responses[0], responses[1]); - }); - - }).on('pageinit', "#librarySettingsPage", function () { - - var page = this; - - $('#btnSelectMetadataPath', page).on("click.selectDirectory", function () { + $('#btnSelectMetadataPath', view).on("click.selectDirectory", function () { require(['directorybrowser'], function (directoryBrowser) { @@ -190,7 +160,7 @@ callback: function (path) { if (path) { - $('#txtMetadataPath', page).val(path); + $('#txtMetadataPath', view).val(path); } picker.close(); }, @@ -208,11 +178,41 @@ ApiClient.getSystemInfo().then(function (systemInfo) { if (systemInfo.SupportsLibraryMonitor) { - page.querySelector('.fldLibraryMonitor').classList.remove('hide'); + view.querySelector('.fldLibraryMonitor').classList.remove('hide'); } else { - page.querySelector('.fldLibraryMonitor').classList.add('hide'); + view.querySelector('.fldLibraryMonitor').classList.add('hide'); } }); - }); + + view.addEventListener('viewshow', function () { + LibraryMenu.setTabs('librarysetup', 3, getTabs); + Dashboard.showLoadingMsg(); + + var page = this; + + ApiClient.getServerConfiguration().then(function (config) { + + loadPage(page, config); + }); + + ApiClient.getNamedConfiguration("metadata").then(function (metadata) { + + loadMetadataConfig(page, metadata); + }); + + ApiClient.getNamedConfiguration("fanart").then(function (metadata) { + + loadFanartConfig(page, metadata); + }); + + var promise1 = ApiClient.getNamedConfiguration("chapters"); + var promise2 = ApiClient.getJSON(ApiClient.getUrl("Providers/Chapters")); + + Promise.all([promise1, promise2]).then(function (responses) { + + loadChapters(page, responses[0], responses[1]); + }); + }); + }; }); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index a170959324..2105d4ca11 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -2591,9 +2591,10 @@ var AppInfo = {}; defineRoute({ path: '/librarysettings.html', - dependencies: [], + dependencies: ['emby-collapsible', 'paper-input', 'paper-checkbox', 'paper-button'], autoFocus: false, - roles: 'admin' + roles: 'admin', + controller: 'scripts/librarysettings' }); defineRoute({ diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index 0694e7b0f5..90974ded37 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -140,7 +140,11 @@ }); } - $('.paging', tabContent).html(pagingHtml); + var i, length; + var pagingElems = tabContent.querySelectorAll('.paging'); + for (i = 0, length = pagingElems.length; i < length; i++) { + pagingElems[i].innerHTML = pagingHtml; + } $('.btnNextPage', tabContent).on('click', function () { query.StartIndex += query.Limit;