diff --git a/dashboard-ui/bower_components/emby-apiclient/.bower.json b/dashboard-ui/bower_components/emby-apiclient/.bower.json index 9a56472bf8..f71a2109e6 100644 --- a/dashboard-ui/bower_components/emby-apiclient/.bower.json +++ b/dashboard-ui/bower_components/emby-apiclient/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.0.30", - "_release": "1.0.30", + "version": "1.0.31", + "_release": "1.0.31", "_resolution": { "type": "version", - "tag": "1.0.30", - "commit": "9f144d506da6c01cd99f2421953a9f2c5c96e295" + "tag": "1.0.31", + "commit": "8d350054f19ad1d9cdfc1258baf0f907bcdfb1ae" }, "_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_target": "~1.0.3", diff --git a/dashboard-ui/bower_components/emby-apiclient/store.js b/dashboard-ui/bower_components/emby-apiclient/appstorage.js similarity index 85% rename from dashboard-ui/bower_components/emby-apiclient/store.js rename to dashboard-ui/bower_components/emby-apiclient/appstorage.js index 8bd070c5cc..f1fff45757 100644 --- a/dashboard-ui/bower_components/emby-apiclient/store.js +++ b/dashboard-ui/bower_components/emby-apiclient/appstorage.js @@ -1,4 +1,4 @@ -(function (globalScope) { +define([], function () { function myStore(defaultObject) { @@ -45,7 +45,9 @@ }; } - globalScope.appStorage = new myStore(globalScope.localStorage); - globalScope.sessionStore = new myStore(globalScope.sessionStorage); - -})(this); \ No newline at end of file + try { + return new myStore(localStorage); + } catch (err) { + return new myStore(); + } +}); \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-apiclient/credentials.js b/dashboard-ui/bower_components/emby-apiclient/credentials.js index 38a05c029c..025178f84e 100644 --- a/dashboard-ui/bower_components/emby-apiclient/credentials.js +++ b/dashboard-ui/bower_components/emby-apiclient/credentials.js @@ -1,4 +1,4 @@ -define(['events'], function (Events) { +define(['events', 'appStorage'], function (Events, appStorage) { return function (key) { diff --git a/dashboard-ui/bower_components/iron-behaviors/.bower.json b/dashboard-ui/bower_components/iron-behaviors/.bower.json index 17f68b3351..db08f2170c 100644 --- a/dashboard-ui/bower_components/iron-behaviors/.bower.json +++ b/dashboard-ui/bower_components/iron-behaviors/.bower.json @@ -29,14 +29,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "ignore": [], - "homepage": "https://github.com/polymerelements/iron-behaviors", + "homepage": "https://github.com/PolymerElements/iron-behaviors", "_release": "1.0.12", "_resolution": { "type": "version", "tag": "v1.0.12", "commit": "657f526a2382a659cdf4e13be87ecc89261588a3" }, - "_source": "git://github.com/polymerelements/iron-behaviors.git", + "_source": "git://github.com/PolymerElements/iron-behaviors.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-behaviors" + "_originalSource": "PolymerElements/iron-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-flex-layout/.bower.json b/dashboard-ui/bower_components/iron-flex-layout/.bower.json index 846bf5c150..0985b733c6 100644 --- a/dashboard-ui/bower_components/iron-flex-layout/.bower.json +++ b/dashboard-ui/bower_components/iron-flex-layout/.bower.json @@ -28,14 +28,14 @@ "iron-component-page": "polymerelements/iron-component-page#^1.0.0" }, "ignore": [], - "homepage": "https://github.com/polymerelements/iron-flex-layout", + "homepage": "https://github.com/PolymerElements/iron-flex-layout", "_release": "1.2.2", "_resolution": { "type": "version", "tag": "v1.2.2", "commit": "41c4f35be1368afb770312b907a258175565dbdf" }, - "_source": "git://github.com/polymerelements/iron-flex-layout.git", + "_source": "git://github.com/PolymerElements/iron-flex-layout.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-flex-layout" + "_originalSource": "PolymerElements/iron-flex-layout" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index 52d44c1907..ebb18c5b7b 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -36,7 +36,7 @@ "tag": "v1.0.8", "commit": "e9a66727f3da0446f04956d4e4f1dcd51cdec2ff" }, - "_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" } \ 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/scripts/backdrops.js b/dashboard-ui/scripts/backdrops.js index 24e1608e1c..759741e744 100644 --- a/dashboard-ui/scripts/backdrops.js +++ b/dashboard-ui/scripts/backdrops.js @@ -38,13 +38,15 @@ return Math.floor(Math.random() * (max - min) + min); } + var cache = {}; + function getBackdropItemIds(apiClient, userId, types, parentId) { var key = 'backdrops2_' + userId + (types || '') + (parentId || ''); var deferred = $.Deferred(); - var data = sessionStore.getItem(key); + var data = cache[key]; if (data) { @@ -73,7 +75,7 @@ }; }); - sessionStore.setItem(key, JSON.stringify(images)); + cache[key] = JSON.stringify(images); deferred.resolveWith(null, [images]); }); } diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index d1e33a32a2..9678c96700 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1883,6 +1883,13 @@ var AppInfo = {}; paths.wakeonlan = apiClientBowerPath + "/wakeonlan"; } + // hack for an android test before browserInfo is loaded + if (Dashboard.isRunningInCordova() && window.MainActivity) { + paths.appStorage = "cordova/android/appstorage"; + } else { + paths.appStorage = apiClientBowerPath + "/appstorage"; + } + var sha1Path = bowerPath + "/cryptojslib/components/sha1-min"; var md5Path = bowerPath + "/cryptojslib/components/md5-min"; var shim = {}; @@ -1987,8 +1994,6 @@ var AppInfo = {}; define("localassetmanager", [apiClientBowerPath + "/localassetmanager"]); define("fileupload", [apiClientBowerPath + "/fileupload"]); } - - define("apiclient-store", [apiClientBowerPath + "/store"]); define("apiclient-deferred", ["legacy/deferred"]); define("connectionmanager", [apiClientBowerPath + "/connectionmanager"]); @@ -2001,14 +2006,6 @@ var AppInfo = {}; function init(hostingAppInfo) { - if (Dashboard.isRunningInCordova() && browserInfo.android) { - define("appstorage", ["cordova/android/appstorage"]); - } else { - define('appstorage', [], function () { - return appStorage; - }); - } - if (Dashboard.isRunningInCordova() && browserInfo.android) { define("nativedirectorychooser", ["cordova/android/nativedirectorychooser"]); } @@ -2119,7 +2116,6 @@ var AppInfo = {}; deps.push('connectionmanagerfactory'); deps.push('credentialprovider'); - deps.push('appstorage'); deps.push('scripts/appsettings'); deps.push('scripts/extensions'); @@ -2429,15 +2425,17 @@ var AppInfo = {}; var initialDependencies = []; initialDependencies.push('browser'); - initialDependencies.push('apiclient-store'); + initialDependencies.push('appStorage'); if (!window.Promise) { initialDependencies.push('native-promise-only'); } - require(initialDependencies, function (browser) { + require(initialDependencies, function (browser, appStorage) { window.browserInfo = browser; + window.appStorage = appStorage; + setAppInfo(); setDocumentClasses();