diff --git a/dashboard-ui/bower_components/doc-ready/.bower.json b/dashboard-ui/bower_components/doc-ready/.bower.json index adda4287b4..d4d75eca65 100644 --- a/dashboard-ui/bower_components/doc-ready/.bower.json +++ b/dashboard-ui/bower_components/doc-ready/.bower.json @@ -39,6 +39,6 @@ "commit": "cec8e49744a1e18b14a711eea77e201bb70de544" }, "_source": "git://github.com/desandro/doc-ready.git", - "_target": "1.0.x", + "_target": "~1.0.4", "_originalSource": "doc-ready" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json index 2f654d71c6..157225ee71 100644 --- a/dashboard-ui/bower_components/paper-ripple/.bower.json +++ b/dashboard-ui/bower_components/paper-ripple/.bower.json @@ -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" } \ No newline at end of file diff --git a/dashboard-ui/components/paperdialoghelper.js b/dashboard-ui/components/paperdialoghelper.js index 516882cb7a..a9d0bf298a 100644 --- a/dashboard-ui/components/paperdialoghelper.js +++ b/dashboard-ui/components/paperdialoghelper.js @@ -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.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'); diff --git a/dashboard-ui/devices/ie/ie.js b/dashboard-ui/devices/ie/ie.js index 4cf7f91d81..5f39ead74d 100644 --- a/dashboard-ui/devices/ie/ie.js +++ b/dashboard-ui/devices/ie/ie.js @@ -1,6 +1,6 @@ (function () { - Dashboard.importCss('devices/ie/ie.css'); + require(['css!devices/ie/ie.css']); var browserSwitchKey = "ieswitchbrowser"; function getWeek(date) { diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index fe19d391ae..2f2b2cdc92 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -2119,13 +2119,15 @@ var AppInfo = {}; function onAppReady(promiseResolve) { + var deps = []; + // Do these now to prevent a flash of content if (AppInfo.isNativeApp && browserInfo.android) { - Dashboard.importCss('devices/android/android.css'); + deps.push('css!devices/android/android.css'); } else if (AppInfo.isNativeApp && browserInfo.safari) { - Dashboard.importCss('devices/ios/ios.css'); + deps.push('css!devices/ios/ios.css'); } else if (!browserInfo.android) { - Dashboard.importCss('devices/android/android.css'); + deps.push('css!devices/android/android.css'); } loadTheme(); @@ -2135,15 +2137,14 @@ var AppInfo = {}; } if (Dashboard.isRunningInCordova()) { - require(['scripts/registrationservices', 'cordova/back']); + deps.push('scripts/registrationservices'); + deps.push('cordova/back'); if (browserInfo.android) { - require(['cordova/android/androidcredentials']); + deps.push('cordova/android/androidcredentials'); } } - var deps = []; - if (browserInfo.msie) { deps.push('devices/ie/ie'); }