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

rework loading of appstorage

Browse source
This commit is contained in:
Luke Pulverenti 2016-03-07 14:13:58 -05:00
parent d0afade8ed
commit 3a7ed6f85f
13 changed files with 214 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2332,58 +2332,60 @@ var AppInfo = {};
return new Promise(function (resolve, reject) {
var deviceName;
require(['appStorage'], function (appStorage) {
var deviceName;
if (browserInfo.chrome) {
deviceName = "Chrome";
} else if (browserInfo.edge) {
deviceName = "Edge";
} else if (browserInfo.firefox) {
deviceName = "Firefox";
} else if (browserInfo.msie) {
deviceName = "Internet Explorer";
} else {
deviceName = "Web Browser";
}
if (browserInfo.chrome) {
deviceName = "Chrome";
} else if (browserInfo.edge) {
deviceName = "Edge";
} else if (browserInfo.firefox) {
deviceName = "Firefox";
} else if (browserInfo.msie) {
deviceName = "Internet Explorer";
} else {
deviceName = "Web Browser";
}
if (browserInfo.version) {
deviceName += " " + browserInfo.version;
}
if (browserInfo.version) {
deviceName += " " + browserInfo.version;
}
if (browserInfo.ipad) {
deviceName += " Ipad";
} else if (browserInfo.iphone) {
deviceName += " Iphone";
} else if (browserInfo.android) {
deviceName += " Android";
}
if (browserInfo.ipad) {
deviceName += " Ipad";
} else if (browserInfo.iphone) {
deviceName += " Iphone";
} else if (browserInfo.android) {
deviceName += " Android";
}
function onDeviceAdAcquired(id) {
function onDeviceAdAcquired(id) {
resolve({
deviceId: id,
deviceName: deviceName,
appName: "Emby Web Client",
appVersion: window.dashboardVersion
});
}
resolve({
deviceId: id,
deviceName: deviceName,
appName: "Emby Web Client",
appVersion: window.dashboardVersion
});
}
var deviceIdKey = '_deviceId1';
var deviceId = appStorage.getItem(deviceIdKey);
var deviceIdKey = '_deviceId1';
var deviceId = appStorage.getItem(deviceIdKey);
if (deviceId) {
onDeviceAdAcquired(deviceId);
} else {
require(['cryptojs-sha1'], function () {
var keys = [];
keys.push(navigator.userAgent);
keys.push((navigator.cpuClass || ""));
keys.push(new Date().getTime());
var randomId = CryptoJS.SHA1(keys.join('|')).toString();
appStorage.setItem(deviceIdKey, randomId);
onDeviceAdAcquired(randomId);
});
}
if (deviceId) {
onDeviceAdAcquired(deviceId);
} else {
require(['cryptojs-sha1'], function () {
var keys = [];
keys.push(navigator.userAgent);
keys.push((navigator.cpuClass || ""));
keys.push(new Date().getTime());
var randomId = CryptoJS.SHA1(keys.join('|')).toString();
appStorage.setItem(deviceIdKey, randomId);
onDeviceAdAcquired(randomId);
});
}
});
});
}
@ -2403,18 +2405,16 @@ var AppInfo = {};
var initialDependencies = [];
initialDependencies.push('browser');
initialDependencies.push('appStorage');
if (!window.Promise) {
initialDependencies.push('native-promise-only');
}
require(initialDependencies, function (browser, appStorage) {
require(initialDependencies, function (browser) {
initRequireWithBrowser(browser);
window.browserInfo = browser;
window.appStorage = appStorage;
setAppInfo();
setDocumentClasses();