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

Migration of loading to ES6 module

Browse source
This commit is contained in:
Cameron 2020-07-28 23:08:27 +01:00
parent 40b98bb3d4
commit 675cad71d8
45 changed files with 146 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/appRouter.js
View file

@ -22,7 +22,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
function beginConnectionWizard() {
backdrop.clearBackdrop();
loading.show();
loading.default.show();
connectionManager.connect({
enableAutoLogin: appSettings.enableAutoLogin()
}).then(function (result) {
@ -33,7 +33,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
function handleConnectionResult(result) {
switch (result.State) {
case 'SignedIn':
loading.hide();
loading.default.hide();
skinManager.loadUserSkin();
break;
case 'ServerSignIn':
@ -277,7 +277,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
var firstConnectionResult;
function start(options) {
loading.show();
loading.default.show();
initApiClients();
@ -297,7 +297,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
hashbang: options.hashbang !== false
});
}).catch().then(function() {
loading.hide();
loading.default.hide();
});
}
@ -512,7 +512,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
if (currentRouteInfo && currentRouteInfo.path === path) {
// can't use this with home right now due to the back menu
if (currentRouteInfo.route.type !== 'home') {
loading.hide();
loading.default.hide();
return Promise.resolve();
}
}