mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #1747 from MediaBrowser/dev

Browse source 
fix content sometimes not appearing after restart
This commit is contained in:
Luke 2016-05-19 01:24:52 -04:00
commit 7253057614
1 changed files with 51 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dashboard-ui/components/viewcontainer-lite.js
View file

@ -214,11 +214,13 @@ define(['browser'], function (browser) {
function slide(newAnimatedPage, oldAnimatedPage, transition, isBack) { function slide(newAnimatedPage, oldAnimatedPage, transition, isBack) {
return new Promise(function (resolve, reject) {
// Do not use fill: both or the ability to swipe horizontally may be affected on Chrome 50
var timings = { var timings = {
duration: 450, duration: 450,
iterations: 1, iterations: 1,
easing: 'ease-out', easing: 'ease-out'
fill: 'both'
} }
var animations = []; var animations = [];
@ -247,18 +249,19 @@ define(['browser'], function (browser) {
currentAnimations = animations; currentAnimations = animations;
return new Promise(function (resolve, reject) {
animations[animations.length - 1].onfinish = resolve; animations[animations.length - 1].onfinish = resolve;
}); });
} }
function fade(newAnimatedPage, oldAnimatedPage, transition, isBack) { function fade(newAnimatedPage, oldAnimatedPage, transition, isBack) {
return new Promise(function (resolve, reject) {
// Do not use fill: both or the ability to swipe horizontally may be affected on Chrome 50
var timings = { var timings = {
duration: 140, duration: 140,
iterations: 1, iterations: 1,
easing: 'ease-out', easing: 'ease-out'
fill: 'both'
} }
var animations = []; var animations = [];
@ -283,7 +286,6 @@ define(['browser'], function (browser) {
currentAnimations = animations; currentAnimations = animations;
return new Promise(function (resolve, reject) {
animations[animations.length - 1].onfinish = resolve; animations[animations.length - 1].onfinish = resolve;
}); });
} }