diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 43d7a133b0..de693ae69a 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.3.73", - "_release": "1.3.73", + "version": "1.3.74", + "_release": "1.3.74", "_resolution": { "type": "version", - "tag": "1.3.73", - "commit": "0727aaabe8c649aa53cd732507f11a295a581ac3" + "tag": "1.3.74", + "commit": "cb08b23d4989aaab3ee4b4ba5069eee6a96e04ad" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js index c59e533dc4..39050760ee 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js +++ b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js @@ -151,6 +151,11 @@ define(['browser'], function (browser) { function getMaxBitrate() { + // 10mbps + if (browser.xboxOne) { + return 10000000; + } + var userAgent = navigator.userAgent.toLowerCase(); if (browser.tizen) { 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 1353e3579a..76872d77a8 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 @@ -101,13 +101,20 @@ EmbySelectPrototype.createdCallback = function () { + var parent = this.parentNode; + if (!parent.classList.contains('selectContainer')) { + var div = this.ownerDocument.createElement('div'); + div.classList.add('selectContainer'); + parent.replaceChild(div, this); + div.appendChild(this); + } if (!this.id) { this.id = 'select' + new Date().getTime(); } this.addEventListener('mousedown', onMouseDown); this.addEventListener('keydown', onKeyDown); this.addEventListener('focus', onFocus); - this.addEventListener('keydown', onBlur); + this.addEventListener('blur', onBlur); }; EmbySelectPrototype.attachedCallback = function () { diff --git a/dashboard-ui/bower_components/emby-webcomponents/viewmanager/viewcontainer-lite.js b/dashboard-ui/bower_components/emby-webcomponents/viewmanager/viewcontainer-lite.js index 2023ef00f3..f401d62705 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/viewmanager/viewcontainer-lite.js +++ b/dashboard-ui/bower_components/emby-webcomponents/viewmanager/viewcontainer-lite.js @@ -116,7 +116,8 @@ define(['browser'], function (browser) { var timings = { duration: 450, iterations: 1, - easing: 'ease-out' + easing: 'ease-out', + fill: 'both' } var animations = []; @@ -155,7 +156,8 @@ define(['browser'], function (browser) { var timings = { duration: 200, iterations: 1, - easing: 'ease-out' + easing: 'ease-out', + fill: 'both' } var animations = []; diff --git a/dashboard-ui/components/viewcontainer-lite.js b/dashboard-ui/components/viewcontainer-lite.js index e16da31a13..534398d20a 100644 --- a/dashboard-ui/components/viewcontainer-lite.js +++ b/dashboard-ui/components/viewcontainer-lite.js @@ -1,8 +1,9 @@ define(['browser'], function (browser) { - var allPages = document.querySelectorAll('.mainAnimatedPage'); + var mainAnimatedPages = document.querySelector('.mainAnimatedPages'); + var allPages = []; var currentUrls = []; - var pageContainerCount = allPages.length; + var pageContainerCount = 3; var selectedPageIndex = -1; function enableAnimation() { @@ -26,7 +27,7 @@ define(['browser'], function (browser) { cancelActiveAnimations(); - var selected = getSelectedIndex(allPages); + var selected = selectedPageIndex; var previousAnimatable = selected == -1 ? null : allPages[selected]; var pageIndex = selected + 1; @@ -60,35 +61,48 @@ define(['browser'], function (browser) { require(dependencies, function () { - var animatable = allPages[pageIndex]; - - var currentPage = animatable.querySelector('.page-view'); + var currentPage = allPages[pageIndex]; if (currentPage) { triggerDestroy(currentPage); } - var view; + var view = newView; - if (typeof (newView) == 'string') { - animatable.innerHTML = newView; - view = animatable.querySelector('.page-view'); + if (typeof (view) == 'string') { + view = document.createElement('div'); + view.innerHTML = newView; + } + + if (currentPage) { + if (newViewInfo.hasScript) { + // TODO: figure this out without jQuery + view = $(view).appendTo(mainAnimatedPages)[0]; + mainAnimatedPages.removeChild(currentPage); + } else { + mainAnimatedPages.replaceChild(view, currentPage); + } } else { if (newViewInfo.hasScript) { // TODO: figure this out without jQuery - animatable.innerHTML = ''; - $(newView).appendTo(animatable); + view = $(view).appendTo(mainAnimatedPages)[0]; } else { - if (currentPage) { - animatable.replaceChild(newView, currentPage); - } else { - animatable.appendChild(newView); - } + mainAnimatedPages.appendChild(view); } - enhanceNewView(dependencies, newView); - view = newView; } + if (typeof (newView) != 'string') { + enhanceNewView(dependencies, view); + } + + if (options.type) { + view.setAttribute('data-type', options.type); + } + + var animatable = view; + view.classList.add('mainAnimatedPage'); + allPages[pageIndex] = view; + if (onBeforeChange) { onBeforeChange(view, false, options); } @@ -155,20 +169,13 @@ define(['browser'], function (browser) { function normalizeNewView(options) { if (options.view.indexOf('data-role="page"') == -1) { - var html = '
'; - html += options.view; - html += '
'; - return html; + return options.view; } var hasScript = options.view.indexOf('
-
-
-
+