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 components

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-28 15:45:52 -05:00
parent 73e6734e7d
commit 832ce4f3a0
9 changed files with 38 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-apiclient/.bower.json vendored
View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.0.30", "version": "1.0.31",
"_release": "1.0.30", "_release": "1.0.31",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.0.30", "tag": "1.0.31",
"commit": "9f144d506da6c01cd99f2421953a9f2c5c96e295" "commit": "8d350054f19ad1d9cdfc1258baf0f907bcdfb1ae"
}, },
"_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "~1.0.3", "_target": "~1.0.3",

12
dashboard-ui/bower_components/emby-apiclient/store.js → dashboard-ui/bower_components/emby-apiclient/appstorage.js vendored
View file

@ -1,4 +1,4 @@
(function (globalScope) { define([], function () {
function myStore(defaultObject) { function myStore(defaultObject) {
@ -45,7 +45,9 @@
}; };
} }
globalScope.appStorage = new myStore(globalScope.localStorage); try {
globalScope.sessionStore = new myStore(globalScope.sessionStorage); return new myStore(localStorage);
} catch (err) {
})(this); return new myStore();
}
});

2
dashboard-ui/bower_components/emby-apiclient/credentials.js vendored
View file

@ -1,4 +1,4 @@
define(['events'], function (Events) { define(['events', 'appStorage'], function (Events, appStorage) {
return function (key) { return function (key) {

6
dashboard-ui/bower_components/iron-behaviors/.bower.json vendored
View file

@ -29,14 +29,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/polymerelements/iron-behaviors", "homepage": "https://github.com/PolymerElements/iron-behaviors",
"_release": "1.0.12", "_release": "1.0.12",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.12", "tag": "v1.0.12",
"commit": "657f526a2382a659cdf4e13be87ecc89261588a3" "commit": "657f526a2382a659cdf4e13be87ecc89261588a3"
}, },
"_source": "git://github.com/polymerelements/iron-behaviors.git", "_source": "git://github.com/PolymerElements/iron-behaviors.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-behaviors" "_originalSource": "PolymerElements/iron-behaviors"
} }

6
dashboard-ui/bower_components/iron-flex-layout/.bower.json vendored
View file

@ -28,14 +28,14 @@
"iron-component-page": "polymerelements/iron-component-page#^1.0.0" "iron-component-page": "polymerelements/iron-component-page#^1.0.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/polymerelements/iron-flex-layout", "homepage": "https://github.com/PolymerElements/iron-flex-layout",
"_release": "1.2.2", "_release": "1.2.2",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.2.2", "tag": "v1.2.2",
"commit": "41c4f35be1368afb770312b907a258175565dbdf" "commit": "41c4f35be1368afb770312b907a258175565dbdf"
}, },
"_source": "git://github.com/polymerelements/iron-flex-layout.git", "_source": "git://github.com/PolymerElements/iron-flex-layout.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-flex-layout" "_originalSource": "PolymerElements/iron-flex-layout"
} }

4
dashboard-ui/bower_components/iron-selector/.bower.json vendored
View file

@ -36,7 +36,7 @@
"tag": "v1.0.8", "tag": "v1.0.8",
"commit": "e9a66727f3da0446f04956d4e4f1dcd51cdec2ff" "commit": "e9a66727f3da0446f04956d4e4f1dcd51cdec2ff"
}, },
"_source": "git://github.com/PolymerElements/iron-selector.git", "_source": "git://github.com/polymerelements/iron-selector.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-selector" "_originalSource": "polymerelements/iron-selector"
} }

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"
} }

6
dashboard-ui/scripts/backdrops.js
View file

@ -38,13 +38,15 @@
return Math.floor(Math.random() * (max - min) + min); return Math.floor(Math.random() * (max - min) + min);
} }
var cache = {};
function getBackdropItemIds(apiClient, userId, types, parentId) { function getBackdropItemIds(apiClient, userId, types, parentId) {
var key = 'backdrops2_' + userId + (types || '') + (parentId || ''); var key = 'backdrops2_' + userId + (types || '') + (parentId || '');
var deferred = $.Deferred(); var deferred = $.Deferred();
var data = sessionStore.getItem(key); var data = cache[key];
if (data) { if (data) {
@ -73,7 +75,7 @@
}; };
}); });
sessionStore.setItem(key, JSON.stringify(images)); cache[key] = JSON.stringify(images);
deferred.resolveWith(null, [images]); deferred.resolveWith(null, [images]);
}); });
} }

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

@ -1883,6 +1883,13 @@ var AppInfo = {};
paths.wakeonlan = apiClientBowerPath + "/wakeonlan"; 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 sha1Path = bowerPath + "/cryptojslib/components/sha1-min";
var md5Path = bowerPath + "/cryptojslib/components/md5-min"; var md5Path = bowerPath + "/cryptojslib/components/md5-min";
var shim = {}; var shim = {};
@ -1987,8 +1994,6 @@ var AppInfo = {};
define("localassetmanager", [apiClientBowerPath + "/localassetmanager"]); define("localassetmanager", [apiClientBowerPath + "/localassetmanager"]);
define("fileupload", [apiClientBowerPath + "/fileupload"]); define("fileupload", [apiClientBowerPath + "/fileupload"]);
} }
define("apiclient-store", [apiClientBowerPath + "/store"]);
define("apiclient-deferred", ["legacy/deferred"]); define("apiclient-deferred", ["legacy/deferred"]);
define("connectionmanager", [apiClientBowerPath + "/connectionmanager"]); define("connectionmanager", [apiClientBowerPath + "/connectionmanager"]);
@ -2001,14 +2006,6 @@ var AppInfo = {};
function init(hostingAppInfo) { function init(hostingAppInfo) {
if (Dashboard.isRunningInCordova() && browserInfo.android) {
define("appstorage", ["cordova/android/appstorage"]);
} else {
define('appstorage', [], function () {
return appStorage;
});
}
if (Dashboard.isRunningInCordova() && browserInfo.android) { if (Dashboard.isRunningInCordova() && browserInfo.android) {
define("nativedirectorychooser", ["cordova/android/nativedirectorychooser"]); define("nativedirectorychooser", ["cordova/android/nativedirectorychooser"]);
} }
@ -2119,7 +2116,6 @@ var AppInfo = {};
deps.push('connectionmanagerfactory'); deps.push('connectionmanagerfactory');
deps.push('credentialprovider'); deps.push('credentialprovider');
deps.push('appstorage');
deps.push('scripts/appsettings'); deps.push('scripts/appsettings');
deps.push('scripts/extensions'); deps.push('scripts/extensions');
@ -2429,15 +2425,17 @@ var AppInfo = {};
var initialDependencies = []; var initialDependencies = [];
initialDependencies.push('browser'); initialDependencies.push('browser');
initialDependencies.push('apiclient-store'); initialDependencies.push('appStorage');
if (!window.Promise) { if (!window.Promise) {
initialDependencies.push('native-promise-only'); initialDependencies.push('native-promise-only');
} }
require(initialDependencies, function (browser) { require(initialDependencies, function (browser, appStorage) {
window.browserInfo = browser; window.browserInfo = browser;
window.appStorage = appStorage;
setAppInfo(); setAppInfo();
setDocumentClasses(); setDocumentClasses();