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

Apply suggestions

Browse source
This commit is contained in:
Cameron 2020-07-31 21:35:01 +01:00
parent df162f3ca3
commit dd0e47a70e
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/appRouter.js
View file

@ -1,6 +1,8 @@
define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdrop', 'browser', 'page', 'appSettings', 'apphost', 'connectionManager'], function (loading, globalize, events, viewManager, skinManager, backdrop, browser, page, appSettings, appHost, connectionManager) { define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdrop', 'browser', 'page', 'appSettings', 'apphost', 'connectionManager'], function (loading, globalize, events, viewManager, skinManager, backdrop, browser, page, appSettings, appHost, connectionManager) {
'use strict'; 'use strict';
loading = loading.default || loading;
var appRouter = { var appRouter = {
showLocalLogin: function (serverId, manualLogin) { showLocalLogin: function (serverId, manualLogin) {
var pageName = manualLogin ? 'manuallogin' : 'login'; var pageName = manualLogin ? 'manuallogin' : 'login';
@ -22,7 +24,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
function beginConnectionWizard() { function beginConnectionWizard() {
backdrop.clearBackdrop(); backdrop.clearBackdrop();
loading.default.show(); loading.show();
connectionManager.connect({ connectionManager.connect({
enableAutoLogin: appSettings.enableAutoLogin() enableAutoLogin: appSettings.enableAutoLogin()
}).then(function (result) { }).then(function (result) {
@ -33,7 +35,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
function handleConnectionResult(result) { function handleConnectionResult(result) {
switch (result.State) { switch (result.State) {
case 'SignedIn': case 'SignedIn':
loading.default.hide(); loading.hide();
skinManager.loadUserSkin(); skinManager.loadUserSkin();
break; break;
case 'ServerSignIn': case 'ServerSignIn':
@ -276,7 +278,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
var firstConnectionResult; var firstConnectionResult;
function start(options) { function start(options) {
loading.default.show(); loading.show();
initApiClients(); initApiClients();
@ -296,7 +298,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
hashbang: options.hashbang !== false hashbang: options.hashbang !== false
}); });
}).catch().then(function() { }).catch().then(function() {
loading.default.hide(); loading.hide();
}); });
} }
@ -511,7 +513,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
if (currentRouteInfo && currentRouteInfo.path === path) { if (currentRouteInfo && currentRouteInfo.path === path) {
// can't use this with home right now due to the back menu // can't use this with home right now due to the back menu
if (currentRouteInfo.route.type !== 'home') { if (currentRouteInfo.route.type !== 'home') {
loading.default.hide(); loading.hide();
return Promise.resolve(); return Promise.resolve();
} }
} }

2
src/controllers/music/musicrecommended.js
View file

@ -17,8 +17,6 @@ import 'flexStyles';
/* eslint-disable indent */ /* eslint-disable indent */
loading = loading.default || loading;
function itemsPerRow() { function itemsPerRow() {
const screenWidth = dom.getWindowSize().innerWidth; const screenWidth = dom.getWindowSize().innerWidth;