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

update dialogs

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-03 12:11:40 -05:00
parent a5be57afdc
commit 2027714898
5 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/bower_components/doc-ready/.bower.json vendored
View file

@ -39,6 +39,6 @@
"commit": "cec8e49744a1e18b14a711eea77e201bb70de544" "commit": "cec8e49744a1e18b14a711eea77e201bb70de544"
}, },
"_source": "git://github.com/desandro/doc-ready.git", "_source": "git://github.com/desandro/doc-ready.git",
"_target": "1.0.x", "_target": "~1.0.4",
"_originalSource": "doc-ready" "_originalSource": "doc-ready"
} }

6
dashboard-ui/bower_components/paper-ripple/.bower.json vendored
View file

@ -32,14 +32,14 @@
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/polymerelements/paper-ripple", "homepage": "https://github.com/PolymerElements/paper-ripple",
"_release": "1.0.5", "_release": "1.0.5",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.5", "tag": "v1.0.5",
"commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
}, },
"_source": "git://github.com/polymerelements/paper-ripple.git", "_source": "git://github.com/PolymerElements/paper-ripple.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/paper-ripple" "_originalSource": "PolymerElements/paper-ripple"
} }

10
dashboard-ui/components/paperdialoghelper.js
View file

@ -96,10 +96,14 @@
} }
} }
//// seeing max call stack size exceeded in the debugger with this // seeing max call stack size exceeded in the debugger with this
dlg.setAttribute('noAutoFocus', 'noAutoFocus'); dlg.setAttribute('noAutoFocus', 'noAutoFocus');
dlg.entryAnimation = 'scale-up-animation';
dlg.exitAnimation = 'fade-out-animation'; // These don't seem to perform well on mobile
if (!browserInfo.mobile) {
dlg.entryAnimation = 'scale-up-animation';
dlg.exitAnimation = 'fade-out-animation';
}
dlg.classList.add('popupEditor'); dlg.classList.add('popupEditor');

2
dashboard-ui/devices/ie/ie.js
View file

@ -1,6 +1,6 @@
(function () { (function () {
Dashboard.importCss('devices/ie/ie.css'); require(['css!devices/ie/ie.css']);
var browserSwitchKey = "ieswitchbrowser"; var browserSwitchKey = "ieswitchbrowser";
function getWeek(date) { function getWeek(date) {

15
dashboard-ui/scripts/site.js
View file

@ -2119,13 +2119,15 @@ var AppInfo = {};
function onAppReady(promiseResolve) { function onAppReady(promiseResolve) {
var deps = [];
// Do these now to prevent a flash of content // Do these now to prevent a flash of content
if (AppInfo.isNativeApp && browserInfo.android) { if (AppInfo.isNativeApp && browserInfo.android) {
Dashboard.importCss('devices/android/android.css'); deps.push('css!devices/android/android.css');
} else if (AppInfo.isNativeApp && browserInfo.safari) { } else if (AppInfo.isNativeApp && browserInfo.safari) {
Dashboard.importCss('devices/ios/ios.css'); deps.push('css!devices/ios/ios.css');
} else if (!browserInfo.android) { } else if (!browserInfo.android) {
Dashboard.importCss('devices/android/android.css'); deps.push('css!devices/android/android.css');
} }
loadTheme(); loadTheme();
@ -2135,15 +2137,14 @@ var AppInfo = {};
} }
if (Dashboard.isRunningInCordova()) { if (Dashboard.isRunningInCordova()) {
require(['scripts/registrationservices', 'cordova/back']); deps.push('scripts/registrationservices');
deps.push('cordova/back');
if (browserInfo.android) { if (browserInfo.android) {
require(['cordova/android/androidcredentials']); deps.push('cordova/android/androidcredentials');
} }
} }
var deps = [];
if (browserInfo.msie) { if (browserInfo.msie) {
deps.push('devices/ie/ie'); deps.push('devices/ie/ie');
} }