mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
rework loading of appstorage
This commit is contained in:
Luke Pulverenti
parent
d0afade8ed
commit
3a7ed6f85f
13 changed files with 214 additions and 211 deletions
|
|
@ -1,4 +1,4 @@
|
|||
define(['paperdialoghelper', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function (paperDialogHelper) {
|
||||
define(['paperdialoghelper', 'appStorage', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function (paperDialogHelper, appStorage) {
|
||||
|
||||
var currentItem;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
define(['browser'], function (browser) {
|
||||
define(['browser', 'appStorage'], function (browser, appStorage) {
|
||||
|
||||
require(['css!devices/ie/ie.css']);
|
||||
var browserSwitchKey = "ieswitchbrowser";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
(function ($, document) {
|
||||
define(['appStorage'], function (appStorage) {
|
||||
|
||||
var pageBackgroundCreated;
|
||||
|
||||
|
|
@ -246,4 +246,4 @@
|
|||
clear: clearBackdrop
|
||||
};
|
||||
|
||||
})(jQuery, document);
|
||||
});
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
define(['playlistManager', 'appSettings'], function (playlistManager, appSettings) {
|
||||
define(['playlistManager', 'appSettings', 'appStorage'], function (playlistManager, appSettings, appStorage) {
|
||||
|
||||
var libraryBrowser = (function (window, document, screen) {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
define(['appSettings'], function (appSettings) {
|
||||
define(['appSettings', 'appStorage'], function (appSettings, appStorage) {
|
||||
|
||||
var showOverlayTimeout;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
(function (window) {
|
||||
define(['appStorage'], function (appStorage) {
|
||||
|
||||
var currentDisplayInfo;
|
||||
function mirrorItem(info) {
|
||||
|
|
@ -1061,4 +1061,4 @@
|
|||
mirrorIfEnabled(info);
|
||||
});
|
||||
|
||||
})(this);
|
||||
});
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
define(['appSettings', 'userSettings'], function (appSettings, userSettings) {
|
||||
define(['appSettings', 'userSettings', 'appStorage'], function (appSettings, userSettings, appStorage) {
|
||||
|
||||
function mediaPlayer() {
|
||||
|
||||
|
|
@ -1729,7 +1729,7 @@ define(['appSettings', 'userSettings'], function (appSettings, userSettings) {
|
|||
|
||||
window.MediaPlayer = new mediaPlayer();
|
||||
|
||||
window.MediaPlayer.init = function() {
|
||||
window.MediaPlayer.init = function () {
|
||||
window.MediaController.registerPlayer(window.MediaPlayer);
|
||||
window.MediaController.setActivePlayer(window.MediaPlayer, window.MediaPlayer.getTargetsInternal()[0]);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
define(['userSettings'], function (userSettings) {
|
||||
define(['userSettings', 'appStorage'], function (userSettings, appStorage) {
|
||||
|
||||
function loadForm(page, user) {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
(function ($, document) {
|
||||
define(['appStorage'], function (appStorage) {
|
||||
|
||||
var data = {};
|
||||
function getPageData() {
|
||||
|
|
@ -197,4 +197,4 @@
|
|||
}
|
||||
};
|
||||
|
||||
})(jQuery, document);
|
||||
});
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
(function () {
|
||||
define(['appStorage'], function (appStorage) {
|
||||
|
||||
var supporterPlaybackKey = 'lastSupporterPlaybackMessage4';
|
||||
|
||||
|
|
@ -297,4 +297,4 @@
|
|||
}
|
||||
};
|
||||
|
||||
})();
|
||||
});
|
||||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -1,175 +1,178 @@
|
|||
$.fn.taskButton = function (options) {
|
||||
define(['appStorage'], function (appStorage) {
|
||||
|
||||
function pollTasks(button) {
|
||||
$.fn.taskButton = function (options) {
|
||||
|
||||
ApiClient.getScheduledTasks({
|
||||
function pollTasks(button) {
|
||||
|
||||
IsEnabled: true
|
||||
ApiClient.getScheduledTasks({
|
||||
|
||||
}).then(function (tasks) {
|
||||
IsEnabled: true
|
||||
|
||||
updateTasks(button, tasks);
|
||||
});
|
||||
}).then(function (tasks) {
|
||||
|
||||
}
|
||||
updateTasks(button, tasks);
|
||||
});
|
||||
|
||||
function updateTasks(button, tasks) {
|
||||
}
|
||||
|
||||
var task = tasks.filter(function (t) {
|
||||
function updateTasks(button, tasks) {
|
||||
|
||||
return t.Key == options.taskKey;
|
||||
var task = tasks.filter(function (t) {
|
||||
|
||||
})[0];
|
||||
return t.Key == options.taskKey;
|
||||
|
||||
if (options.panel) {
|
||||
if (task) {
|
||||
$(options.panel).show();
|
||||
})[0];
|
||||
|
||||
if (options.panel) {
|
||||
if (task) {
|
||||
$(options.panel).show();
|
||||
} else {
|
||||
$(options.panel).hide();
|
||||
}
|
||||
}
|
||||
|
||||
if (!task) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (task.State == 'Idle') {
|
||||
$(button).removeAttr('disabled');
|
||||
} else {
|
||||
$(options.panel).hide();
|
||||
$(button).attr('disabled', 'disabled');
|
||||
}
|
||||
|
||||
$(button).attr('data-taskid', task.Id);
|
||||
|
||||
var progress = (task.CurrentProgressPercentage || 0).toFixed(1);
|
||||
|
||||
if (options.progressElem) {
|
||||
options.progressElem.value = progress;
|
||||
|
||||
if (task.State == 'Running') {
|
||||
options.progressElem.classList.remove('hide');
|
||||
} else {
|
||||
options.progressElem.classList.add('hide');
|
||||
}
|
||||
}
|
||||
|
||||
if (options.lastResultElem) {
|
||||
var lastResult = task.LastExecutionResult ? task.LastExecutionResult.Status : '';
|
||||
|
||||
if (lastResult == "Failed") {
|
||||
options.lastResultElem.html('<span style="color:#FF0000;">' + Globalize.translate('LabelFailed') + '</span>');
|
||||
}
|
||||
else if (lastResult == "Cancelled") {
|
||||
options.lastResultElem.html('<span style="color:#0026FF;">' + Globalize.translate('LabelCancelled') + '</span>');
|
||||
}
|
||||
else if (lastResult == "Aborted") {
|
||||
options.lastResultElem.html('<span style="color:#FF0000;">' + Globalize.translate('LabelAbortedByServerShutdown') + '</span>');
|
||||
} else {
|
||||
options.lastResultElem.html(lastResult);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!task) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (task.State == 'Idle') {
|
||||
$(button).removeAttr('disabled');
|
||||
} else {
|
||||
$(button).attr('disabled', 'disabled');
|
||||
}
|
||||
|
||||
$(button).attr('data-taskid', task.Id);
|
||||
|
||||
var progress = (task.CurrentProgressPercentage || 0).toFixed(1);
|
||||
|
||||
if (options.progressElem) {
|
||||
options.progressElem.value = progress;
|
||||
|
||||
if (task.State == 'Running') {
|
||||
options.progressElem.classList.remove('hide');
|
||||
} else {
|
||||
options.progressElem.classList.add('hide');
|
||||
}
|
||||
}
|
||||
|
||||
if (options.lastResultElem) {
|
||||
var lastResult = task.LastExecutionResult ? task.LastExecutionResult.Status : '';
|
||||
|
||||
if (lastResult == "Failed") {
|
||||
options.lastResultElem.html('<span style="color:#FF0000;">' + Globalize.translate('LabelFailed') + '</span>');
|
||||
}
|
||||
else if (lastResult == "Cancelled") {
|
||||
options.lastResultElem.html('<span style="color:#0026FF;">' + Globalize.translate('LabelCancelled') + '</span>');
|
||||
}
|
||||
else if (lastResult == "Aborted") {
|
||||
options.lastResultElem.html('<span style="color:#FF0000;">' + Globalize.translate('LabelAbortedByServerShutdown') + '</span>');
|
||||
} else {
|
||||
options.lastResultElem.html(lastResult);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function onScheduledTaskMessageConfirmed(instance, id) {
|
||||
ApiClient.startScheduledTask(id).then(function () {
|
||||
|
||||
pollTasks(instance);
|
||||
});
|
||||
}
|
||||
|
||||
function onButtonClick() {
|
||||
|
||||
var button = this;
|
||||
var id = button.getAttribute('data-taskid');
|
||||
|
||||
var key = 'scheduledTaskButton' + options.taskKey;
|
||||
var expectedValue = new Date().getMonth() + '5';
|
||||
|
||||
if (appStorage.getItem(key) == expectedValue) {
|
||||
onScheduledTaskMessageConfirmed(button, id);
|
||||
} else {
|
||||
|
||||
var msg = Globalize.translate('ConfirmMessageScheduledTaskButton');
|
||||
msg += '<br/>';
|
||||
msg += '<div style="margin-top:1em;">';
|
||||
msg += '<a class="clearLink" href="scheduledtasks.html"><paper-button style="color:#3f51b5!important;margin:0;">' + Globalize.translate('ButtonScheduledTasks') + '</paper-button></a>';
|
||||
msg += '</div>';
|
||||
|
||||
require(['confirm'], function (confirm) {
|
||||
|
||||
confirm(msg, Globalize.translate('HeaderConfirmation')).then(function () {
|
||||
appStorage.setItem(key, expectedValue);
|
||||
onScheduledTaskMessageConfirmed(button, id);
|
||||
});
|
||||
function onScheduledTaskMessageConfirmed(instance, id) {
|
||||
ApiClient.startScheduledTask(id).then(function () {
|
||||
|
||||
pollTasks(instance);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function onSocketOpen() {
|
||||
startInterval();
|
||||
}
|
||||
function onButtonClick() {
|
||||
|
||||
function onSocketMessage(e, msg) {
|
||||
if (msg.MessageType == "ScheduledTasksInfo") {
|
||||
var button = this;
|
||||
var id = button.getAttribute('data-taskid');
|
||||
|
||||
var tasks = msg.Data;
|
||||
var key = 'scheduledTaskButton' + options.taskKey;
|
||||
var expectedValue = new Date().getMonth() + '5';
|
||||
|
||||
updateTasks(self, tasks);
|
||||
if (appStorage.getItem(key) == expectedValue) {
|
||||
onScheduledTaskMessageConfirmed(button, id);
|
||||
} else {
|
||||
|
||||
var msg = Globalize.translate('ConfirmMessageScheduledTaskButton');
|
||||
msg += '<br/>';
|
||||
msg += '<div style="margin-top:1em;">';
|
||||
msg += '<a class="clearLink" href="scheduledtasks.html"><paper-button style="color:#3f51b5!important;margin:0;">' + Globalize.translate('ButtonScheduledTasks') + '</paper-button></a>';
|
||||
msg += '</div>';
|
||||
|
||||
require(['confirm'], function (confirm) {
|
||||
|
||||
confirm(msg, Globalize.translate('HeaderConfirmation')).then(function () {
|
||||
appStorage.setItem(key, expectedValue);
|
||||
onScheduledTaskMessageConfirmed(button, id);
|
||||
});
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var self = this;
|
||||
var pollInterval;
|
||||
function onSocketOpen() {
|
||||
startInterval();
|
||||
}
|
||||
|
||||
function onPollIntervalFired() {
|
||||
function onSocketMessage(e, msg) {
|
||||
if (msg.MessageType == "ScheduledTasksInfo") {
|
||||
|
||||
var tasks = msg.Data;
|
||||
|
||||
updateTasks(self, tasks);
|
||||
}
|
||||
}
|
||||
|
||||
var self = this;
|
||||
var pollInterval;
|
||||
|
||||
function onPollIntervalFired() {
|
||||
|
||||
if (!ApiClient.isWebSocketOpen()) {
|
||||
pollTasks(self);
|
||||
}
|
||||
}
|
||||
|
||||
function startInterval() {
|
||||
if (ApiClient.isWebSocketOpen()) {
|
||||
ApiClient.sendWebSocketMessage("ScheduledTasksInfoStart", "1000,1000");
|
||||
}
|
||||
if (pollInterval) {
|
||||
clearInterval(pollInterval);
|
||||
}
|
||||
pollInterval = setInterval(onPollIntervalFired, 5000);
|
||||
}
|
||||
|
||||
function stopInterval() {
|
||||
if (ApiClient.isWebSocketOpen()) {
|
||||
ApiClient.sendWebSocketMessage("ScheduledTasksInfoStop");
|
||||
}
|
||||
if (pollInterval) {
|
||||
clearInterval(pollInterval);
|
||||
}
|
||||
}
|
||||
|
||||
if (options.panel) {
|
||||
$(options.panel).hide();
|
||||
}
|
||||
|
||||
if (options.mode == 'off') {
|
||||
|
||||
this.off('click', onButtonClick);
|
||||
Events.off(ApiClient, 'websocketmessage', onSocketMessage);
|
||||
Events.off(ApiClient, 'websocketopen', onSocketOpen);
|
||||
stopInterval();
|
||||
|
||||
} else if (this.length) {
|
||||
|
||||
this.on('click', onButtonClick);
|
||||
|
||||
if (!ApiClient.isWebSocketOpen()) {
|
||||
pollTasks(self);
|
||||
|
||||
startInterval();
|
||||
|
||||
Events.on(ApiClient, 'websocketmessage', onSocketMessage);
|
||||
Events.on(ApiClient, 'websocketopen', onSocketOpen);
|
||||
}
|
||||
}
|
||||
|
||||
function startInterval() {
|
||||
if (ApiClient.isWebSocketOpen()) {
|
||||
ApiClient.sendWebSocketMessage("ScheduledTasksInfoStart", "1000,1000");
|
||||
}
|
||||
if (pollInterval) {
|
||||
clearInterval(pollInterval);
|
||||
}
|
||||
pollInterval = setInterval(onPollIntervalFired, 5000);
|
||||
}
|
||||
|
||||
function stopInterval() {
|
||||
if (ApiClient.isWebSocketOpen()) {
|
||||
ApiClient.sendWebSocketMessage("ScheduledTasksInfoStop");
|
||||
}
|
||||
if (pollInterval) {
|
||||
clearInterval(pollInterval);
|
||||
}
|
||||
}
|
||||
|
||||
if (options.panel) {
|
||||
$(options.panel).hide();
|
||||
}
|
||||
|
||||
if (options.mode == 'off') {
|
||||
|
||||
this.off('click', onButtonClick);
|
||||
Events.off(ApiClient, 'websocketmessage', onSocketMessage);
|
||||
Events.off(ApiClient, 'websocketopen', onSocketOpen);
|
||||
stopInterval();
|
||||
|
||||
} else if (this.length) {
|
||||
|
||||
this.on('click', onButtonClick);
|
||||
|
||||
pollTasks(self);
|
||||
|
||||
startInterval();
|
||||
|
||||
Events.on(ApiClient, 'websocketmessage', onSocketMessage);
|
||||
Events.on(ApiClient, 'websocketopen', onSocketOpen);
|
||||
}
|
||||
|
||||
return this;
|
||||
};
|
||||
return this;
|
||||
};
|
||||
});
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
(function (document) {
|
||||
define(['appStorage'], function (appStorage) {
|
||||
|
||||
var currentOwnerId;
|
||||
var currentThemeIds = [];
|
||||
|
|
@ -73,4 +73,4 @@
|
|||
}
|
||||
});
|
||||
|
||||
})(document);
|
||||
});
|
||||
Loading…
Add table
Add a link
Reference in a new issue