update tabs

This commit is contained in:
Luke Pulverenti 2016-05-16 16:48:56 -04:00
parent 146daaccd0
commit f2e329c22d
11 changed files with 84 additions and 81 deletions

View file

@ -16,12 +16,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.3.39",
"_release": "1.3.39",
"version": "1.3.40",
"_release": "1.3.40",
"_resolution": {
"type": "version",
"tag": "1.3.39",
"commit": "51bc3e7758132f864fa17488be6f233a55537087"
"tag": "1.3.40",
"commit": "f5d6ceea8a3fccab8b2794df5aabb78309ca57a5"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0",

View file

@ -11,11 +11,8 @@
if (maxAllowedWidth >= 1900) {
options.push({ name: '1080p - 60Mbps', maxHeight: 1080, bitrate: 60000000 });
options.push({ name: '1080p - 55Mbps', maxHeight: 1080, bitrate: 55000000 });
options.push({ name: '1080p - 50Mbps', maxHeight: 1080, bitrate: 50000000 });
options.push({ name: '1080p - 45Mbps', maxHeight: 1080, bitrate: 45000000 });
options.push({ name: '1080p - 40Mbps', maxHeight: 1080, bitrate: 40000000 });
options.push({ name: '1080p - 35Mbps', maxHeight: 1080, bitrate: 35000000 });
options.push({ name: '1080p - 30Mbps', maxHeight: 1080, bitrate: 30000000 });
options.push({ name: '1080p - 25Mbps', maxHeight: 1080, bitrate: 25000000 });
options.push({ name: '1080p - 20Mbps', maxHeight: 1080, bitrate: 20000000 });

View file

@ -3,7 +3,6 @@ define(['browser'], function (browser) {
var allPages = document.querySelectorAll('.mainAnimatedPage');
var currentUrls = [];
var pageContainerCount = allPages.length;
var animationDuration = 500;
var allowAnimation = true;
var selectedPageIndex = -1;
@ -154,7 +153,7 @@ define(['browser'], function (browser) {
function fade(newAnimatedPage, oldAnimatedPage, transition, isBack) {
var timings = {
duration: animationDuration,
duration: 200,
iterations: 1,
easing: 'ease-out',
fill: 'both'
@ -210,16 +209,6 @@ define(['browser'], function (browser) {
onBeforeChange = fn;
}
function sendResolve(resolve, view) {
// Don't report completion until the animation has finished, otherwise rendering may not perform well
setTimeout(function () {
resolve(view);
}, animationDuration);
}
function getSelectedIndex(allPages) {
return selectedPageIndex;
@ -275,31 +264,14 @@ define(['browser'], function (browser) {
currentUrls = [];
}
function parentWithClass(elem, className) {
while (!elem.classList || !elem.classList.contains(className)) {
elem = elem.parentNode;
if (!elem) {
return null;
}
}
return elem;
}
function init(isAnimationAllowed) {
if (allowAnimation && enableAnimation() && !browser.animate) {
require(['webAnimations']);
}
if (enableAnimation() && !browser.animate) {
require(['webAnimations']);
}
return {
loadView: loadView,
tryRestoreView: tryRestoreView,
reset: reset,
setOnBeforeChange: setOnBeforeChange,
init: init
setOnBeforeChange: setOnBeforeChange
};
});