diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 57f144fe97..717bb73caa 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -14,12 +14,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.219", - "_release": "1.4.219", + "version": "1.4.222", + "_release": "1.4.222", "_resolution": { "type": "version", - "tag": "1.4.219", - "commit": "01b409b14bf53cb71f5af887266d0dec0645f7fe" + "tag": "1.4.222", + "commit": "29a8d9be1a6c3bb59bddb54c721c64a8664f9724" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/browser.js b/dashboard-ui/bower_components/emby-webcomponents/browser.js index a34d41433f..b4e05c5a43 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/browser.js +++ b/dashboard-ui/bower_components/emby-webcomponents/browser.js @@ -161,6 +161,7 @@ browser.animate = document.documentElement.animate != null; browser.tizen = userAgent.toLowerCase().indexOf('tizen') != -1 || userAgent.toLowerCase().indexOf('smarthub') != -1; browser.web0s = userAgent.toLowerCase().indexOf('Web0S'.toLowerCase()) != -1; + browser.edgeUwp = browser.edge && userAgent.toLowerCase().indexOf('msapphost') != -1; browser.tv = isTv(); browser.operaTv = browser.tv && userAgent.toLowerCase().indexOf('opr/') != -1; diff --git a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js index 514b625f26..139a05c68a 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js +++ b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js @@ -57,7 +57,7 @@ define(['browser'], function (browser) { if (browser.tizen) { return true; } - if (isEdgeUniversal()) { + if (browser.edgeUwp) { return true; } } @@ -66,7 +66,7 @@ define(['browser'], function (browser) { if (browser.tizen) { return true; } - if (isEdgeUniversal()) { + if (browser.edgeUwp) { return true; } } @@ -94,19 +94,6 @@ define(['browser'], function (browser) { return false; } - function isEdgeUniversal() { - - if (browser.edge) { - - var userAgent = navigator.userAgent.toLowerCase(); - if (userAgent.indexOf('msapphost') != -1) { - return true; - } - } - - return false; - } - function testCanPlayMkv(videoTestElement) { if (videoTestElement.canPlayType('video/x-matroska') || @@ -136,7 +123,7 @@ define(['browser'], function (browser) { return true; } - if (isEdgeUniversal()) { + if (browser.edgeUwp) { return true; } @@ -157,15 +144,15 @@ define(['browser'], function (browser) { switch (container) { case 'asf': - supported = browser.tizen || isEdgeUniversal(); + supported = browser.tizen || browser.edgeUwp; videoAudioCodecs = []; break; case 'avi': - supported = isEdgeUniversal(); + supported = browser.edgeUwp; break; case 'mpg': case 'mpeg': - supported = isEdgeUniversal(); + supported = browser.edgeUwp; break; case '3gp': case 'flv': @@ -176,17 +163,17 @@ define(['browser'], function (browser) { supported = browser.tizen; break; case 'mov': - supported = browser.chrome || isEdgeUniversal(); + supported = browser.chrome || browser.edgeUwp; break; case 'm2ts': - supported = browser.tizen || browser.web0s || isEdgeUniversal(); + supported = browser.tizen || browser.web0s || browser.edgeUwp; break; case 'wmv': - supported = browser.tizen || browser.web0s || isEdgeUniversal(); + supported = browser.tizen || browser.web0s || browser.edgeUwp; videoAudioCodecs = []; break; case 'ts': - supported = browser.tizen || browser.web0s || isEdgeUniversal(); + supported = browser.tizen || browser.web0s || browser.edgeUwp; profileContainer = 'ts,mpegts'; break; default: @@ -207,7 +194,7 @@ define(['browser'], function (browser) { function getMaxBitrate() { // 10mbps - if (browser.xboxOne) { + if (browser.xboxOne || browser.edgeUwp) { return 10000000; } @@ -262,7 +249,7 @@ define(['browser'], function (browser) { // Only put mp3 first if mkv support is there // Otherwise with HLS and mp3 audio we're seeing some browsers // safari is lying - if ((videoTestElement.canPlayType('audio/mp4; codecs="ac-3"').replace(/no/, '') && !browser.safari) || isEdgeUniversal() || browser.tizen) { + if ((videoTestElement.canPlayType('audio/mp4; codecs="ac-3"').replace(/no/, '') && !browser.safari) || browser.edgeUwp || browser.tizen) { videoAudioCodecs.push('ac3'); // This works in edge desktop, but not mobile @@ -289,7 +276,7 @@ define(['browser'], function (browser) { hlsVideoAudioCodecs.push('mp3'); } - if (isEdgeUniversal()) { + if (browser.edgeUwp) { //videoAudioCodecs.push('dca'); //videoAudioCodecs.push('dts'); //videoAudioCodecs.push('truehd'); @@ -321,7 +308,7 @@ define(['browser'], function (browser) { AudioCodec: videoAudioCodecs.join(',') }); - if (isEdgeUniversal()) { + if (browser.edgeUwp) { profile.DirectPlayProfiles.push({ Container: 'mkv', Type: 'Video', diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.js b/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.js index dde2d64ffc..e8693ebe61 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.js +++ b/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.js @@ -4,8 +4,8 @@ function enableNativeMenu() { - if (browser.xboxOne) { - return false; + if (browser.edgeUwp || browser.xboxOne) { + return true; } // Doesn't seem to work at all @@ -36,7 +36,7 @@ select.value = value; } - function showActionSheeet(select) { + function showActionSheet(select) { var labelElem = getLabel(select); var title = labelElem ? (labelElem.textContent || labelElem.innerText) : null; @@ -81,7 +81,7 @@ // e.button=0 for primary (left) mouse button click if (!e.button && !enableNativeMenu()) { e.preventDefault(); - showActionSheeet(this); + showActionSheet(this); } } @@ -92,7 +92,7 @@ case 13: if (!enableNativeMenu()) { e.preventDefault(); - showActionSheeet(this); + showActionSheet(this); } return; case 37: @@ -125,12 +125,6 @@ inputId++; } - this.removeEventListener('focus', onFocus); - this.removeEventListener('blur', onBlur); - - this.removeEventListener('mousedown', onMouseDown); - this.removeEventListener('keydown', onKeyDown); - this.addEventListener('mousedown', onMouseDown); this.addEventListener('keydown', onKeyDown); diff --git a/dashboard-ui/bower_components/emby-webcomponents/router.js b/dashboard-ui/bower_components/emby-webcomponents/router.js index 1cb6d2d59c..658f90e99d 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/router.js +++ b/dashboard-ui/bower_components/emby-webcomponents/router.js @@ -251,7 +251,7 @@ define(['loading', 'dom', 'viewManager', 'skinManager', 'pluginManager', 'backdr function enableHistory() { - if (browser.xboxOne) { + if (browser.xboxOne || browser.edgeUwp) { return false; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js b/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js index 0360cab159..92370dd4b5 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js +++ b/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js @@ -46,7 +46,8 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g MediaTypes: 'Photo', Filters: 'IsNotFolder', - ParentId: item.ParentId + ParentId: item.ParentId, + SortBy: 'SortName' }).then(function (result) { diff --git a/dashboard-ui/bower_components/emby-webcomponents/usersettings/usersettingsbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/usersettings/usersettingsbuilder.js index 64023efb35..2e405899c8 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/usersettings/usersettingsbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/usersettings/usersettingsbuilder.js @@ -23,9 +23,17 @@ define(['appSettings', 'events'], function (appsettings, events) { }); }; - function saveServerPreferences() { + var saveTimeout; + function onSaveTimeout() { + saveTimeout = null; currentApiClient.updateDisplayPreferences('usersettings', displayPrefs, currentUserId, 'emby'); } + function saveServerPreferences() { + if (saveTimeout) { + clearTimeout(saveTimeout); + } + saveTimeout = setTimeout(onSaveTimeout, 50); + } self.set = function (name, value, enableOnServer) { diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json index bc60e6e941..a96f0f050e 100644 --- a/dashboard-ui/bower_components/polymer/.bower.json +++ b/dashboard-ui/bower_components/polymer/.bower.json @@ -40,6 +40,6 @@ "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc" }, "_source": "git://github.com/Polymer/polymer.git", - "_target": "^1.2.0", + "_target": "^1.1.0", "_originalSource": "Polymer/polymer" } \ No newline at end of file diff --git a/dashboard-ui/components/apphost.js b/dashboard-ui/components/apphost.js index 31f73e91fe..bb7027c379 100644 --- a/dashboard-ui/components/apphost.js +++ b/dashboard-ui/components/apphost.js @@ -135,9 +135,7 @@ define(['appStorage', 'browser'], function (appStorage, browser) { features.push('voiceinput'); } - var userAgent = navigator.userAgent.toLowerCase(); - - if (!browser.mobile || userAgent.indexOf('msapphost') != -1) { + if (!browser.mobile || browser.edgeUwp) { features.push('htmlaudioautoplay'); features.push('htmlvideoautoplay'); } diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 81bfa95b60..c2907c7e96 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -1,4 +1,4 @@ -
+
diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index 74eb1ee5de..f39830105c 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -241,36 +241,6 @@ valueChangeEvent: 'click' }); - function parentWithClass(elem, className) { - - while (!elem.classList || !elem.classList.contains(className)) { - elem = elem.parentNode; - - if (!elem) { - return null; - } - } - - return elem; - } - - view.addEventListener('click', function (e) { - - var mediaItem = parentWithClass(e.target, 'mediaItem'); - if (mediaItem) { - var query = getQuery(); - var info = libraryBrowser.getListItemInfo(mediaItem); - - if (info.mediaType == 'Photo') { - require(['scripts/photos'], function () { - Photos.startSlideshow(view, query, info.id); - }); - e.preventDefault(); - return false; - } - } - }); - function updateFilterControls() { var query = getQuery(); diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 0179043e3b..afe72aa93d 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -908,7 +908,7 @@ var backButton = document.querySelector('.headerBackButton'); if (backButton) { - if (Emby.Page.canGoBack()) { + if (page.getAttribute('data-backbutton') == 'true' && Emby.Page.canGoBack()) { backButton.classList.remove('hide'); } else { backButton.classList.add('hide');