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

merge from dev

This commit is contained in:
Luke Pulverenti 2016-01-30 16:35:16 -05:00
parent ceaa65a098
commit eb82bee4ba
4 changed files with 11 additions and 11 deletions

View file

@ -15,12 +15,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.0.39",
"_release": "1.0.39",
"version": "1.0.40",
"_release": "1.0.40",
"_resolution": {
"type": "version",
"tag": "1.0.39",
"commit": "6986f948cb7f54ac18ede654a2f1e1e2d933bd2d"
"tag": "1.0.40",
"commit": "483fcf8659bb829dd12ec41c629c7ab7c380bbd8"
},
"_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "~1.0.0",

View file

@ -115,13 +115,13 @@
dlg.animationConfig = {
// scale up
'entry': {
name: options.entryAnimation || 'scale-up-animation',
name: dlg.entryAnimation,
node: dlg,
timing: { duration: entryAnimationDuration, easing: 'ease-out' }
},
// fade out
'exit': {
name: 'fade-out-animation',
name: dlg.exitAnimation,
node: dlg,
timing: { duration: options.exitAnimationDuration || 400, easing: 'ease-in' }
}