From dd0e47a70efa89cd4f3f748cfc705575885546cb Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 31 Jul 2020 21:35:01 +0100 Subject: [PATCH] Apply suggestions --- src/components/appRouter.js | 12 +++++++----- src/controllers/music/musicrecommended.js | 2 -- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/appRouter.js b/src/components/appRouter.js index 7f4976424c..8c9b953d39 100644 --- a/src/components/appRouter.js +++ b/src/components/appRouter.js @@ -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) { 'use strict'; + loading = loading.default || loading; + var appRouter = { showLocalLogin: function (serverId, manualLogin) { var pageName = manualLogin ? 'manuallogin' : 'login'; @@ -22,7 +24,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro function beginConnectionWizard() { backdrop.clearBackdrop(); - loading.default.show(); + loading.show(); connectionManager.connect({ enableAutoLogin: appSettings.enableAutoLogin() }).then(function (result) { @@ -33,7 +35,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro function handleConnectionResult(result) { switch (result.State) { case 'SignedIn': - loading.default.hide(); + loading.hide(); skinManager.loadUserSkin(); break; case 'ServerSignIn': @@ -276,7 +278,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro var firstConnectionResult; function start(options) { - loading.default.show(); + loading.show(); initApiClients(); @@ -296,7 +298,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro hashbang: options.hashbang !== false }); }).catch().then(function() { - loading.default.hide(); + loading.hide(); }); } @@ -511,7 +513,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.default.hide(); + loading.hide(); return Promise.resolve(); } } diff --git a/src/controllers/music/musicrecommended.js b/src/controllers/music/musicrecommended.js index e06f865a27..82041c5a56 100644 --- a/src/controllers/music/musicrecommended.js +++ b/src/controllers/music/musicrecommended.js @@ -17,8 +17,6 @@ import 'flexStyles'; /* eslint-disable indent */ - loading = loading.default || loading; - function itemsPerRow() { const screenWidth = dom.getWindowSize().innerWidth;