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:
parent
ceaa65a098
commit
eb82bee4ba
4 changed files with 11 additions and 11 deletions
|
@ -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",
|
||||
|
|
|
@ -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' }
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
"tag": "v1.1.0",
|
||||
"commit": "abd9ee7c29f0aae7b583abfe0af9db7f2555eabf"
|
||||
},
|
||||
"_source": "git://github.com/polymerelements/iron-selector.git",
|
||||
"_source": "git://github.com/PolymerElements/iron-selector.git",
|
||||
"_target": "^1.0.0",
|
||||
"_originalSource": "polymerelements/iron-selector"
|
||||
"_originalSource": "PolymerElements/iron-selector"
|
||||
}
|
|
@ -32,14 +32,14 @@
|
|||
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
|
||||
},
|
||||
"ignore": [],
|
||||
"homepage": "https://github.com/PolymerElements/paper-ripple",
|
||||
"homepage": "https://github.com/polymerelements/paper-ripple",
|
||||
"_release": "1.0.5",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "v1.0.5",
|
||||
"commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
|
||||
},
|
||||
"_source": "git://github.com/PolymerElements/paper-ripple.git",
|
||||
"_source": "git://github.com/polymerelements/paper-ripple.git",
|
||||
"_target": "^1.0.0",
|
||||
"_originalSource": "PolymerElements/paper-ripple"
|
||||
"_originalSource": "polymerelements/paper-ripple"
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue