Merge pull request #1679 from Camc314/migrate-to-ES6-47

Migration of loading and favoriteitems to ES6 modules

package.json

@@ -107,6 +107,7 @@
           "src/components/dialogHelper/dialogHelper.js",
           "src/components/directorybrowser/directorybrowser.js",
           "src/components/displaySettings/displaySettings.js",
+          "src/components/favoriteitems.js",
           "src/components/fetchhelper.js",
           "src/components/filterdialog/filterdialog.js",
           "src/components/groupedcards.js",
@@ -126,6 +127,7 @@
           "src/components/lazyLoader/lazyLoaderIntersectionObserver.js",
           "src/components/libraryoptionseditor/libraryoptionseditor.js",
           "src/components/listview/listview.js",
+          "src/components/loading/loading.js",
           "src/components/maintabsmanager.js",
           "src/components/mediainfo/mediainfo.js",
           "src/components/mediaLibraryCreator/mediaLibraryCreator.js",

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';

src/components/favoriteitems.js

@@ -1,5 +1,14 @@
-define(['loading', 'libraryBrowser', 'cardBuilder', 'dom', 'apphost', 'imageLoader', 'globalize', 'layoutManager', 'scrollStyles', 'emby-itemscontainer'], function (loading, libraryBrowser, cardBuilder, dom, appHost, imageLoader, globalize, layoutManager) {
+import loading from 'loading';
-    'use strict';
+import cardBuilder from 'cardBuilder';
+import dom from 'dom';
+import appHost from 'apphost';
+import imageLoader from 'imageLoader';
+import globalize from 'globalize';
+import layoutManager from 'layoutManager';
+import 'scrollStyles';
+import 'emby-itemscontainer';
+
+/* eslint-disable indent */
 
     function enableScrollX() {
         return !layoutManager.desktop;
@@ -94,8 +103,8 @@ define(['loading', 'libraryBrowser', 'cardBuilder', 'dom', 'apphost', 'imageLoad
     }
 
     function loadSection(elem, userId, topParentId, section, isSingleSection) {
-        var screenWidth = dom.getWindowSize().innerWidth;
+        const screenWidth = dom.getWindowSize().innerWidth;
-        var options = {
+        const options = {
             SortBy: 'SortName',
             SortOrder: 'Ascending',
             Filters: 'IsFavorite',
@@ -118,7 +127,7 @@ define(['loading', 'libraryBrowser', 'cardBuilder', 'dom', 'apphost', 'imageLoad
             }
         }
 
-        var promise;
+        let promise;
 
         if (section.types === 'MusicArtist') {
             promise = ApiClient.getArtists(userId, options);
@@ -128,7 +137,7 @@ define(['loading', 'libraryBrowser', 'cardBuilder', 'dom', 'apphost', 'imageLoad
         }
 
         return promise.then(function (result) {
-            var html = '';
+            let html = '';
 
             if (result.Items.length) {
                 if (html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">', !layoutManager.tv && options.Limit && result.Items.length >= options.Limit) {
@@ -144,7 +153,7 @@ define(['loading', 'libraryBrowser', 'cardBuilder', 'dom', 'apphost', 'imageLoad
 
                 html += '</div>';
                 if (enableScrollX()) {
-                    var scrollXClass = 'scrollX hiddenScrollX';
+                    let scrollXClass = 'scrollX hiddenScrollX';
                     if (layoutManager.tv) {
                         scrollXClass += ' smoothScrollX';
                     }
@@ -154,7 +163,7 @@ define(['loading', 'libraryBrowser', 'cardBuilder', 'dom', 'apphost', 'imageLoad
                     html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right">';
                 }
 
-                var cardLayout = appHost.preferVisualCards && section.autoCardLayout && section.showTitle;
+                let cardLayout = appHost.preferVisualCards && section.autoCardLayout && section.showTitle;
                 cardLayout = false;
                 html += cardBuilder.getCardsHtml(result.Items, {
                     preferThumb: section.preferThumb,
@@ -179,10 +188,10 @@ define(['loading', 'libraryBrowser', 'cardBuilder', 'dom', 'apphost', 'imageLoad
         });
     }
 
-    function loadSections(page, userId, topParentId, types) {
+    export function loadSections(page, userId, topParentId, types) {
         loading.show();
-        var sections = getSections();
+        let sections = getSections();
-        var sectionid = getParameterByName('sectionid');
+        const sectionid = getParameterByName('sectionid');
 
         if (sectionid) {
             sections = sections.filter(function (s) {
@@ -196,24 +205,22 @@ define(['loading', 'libraryBrowser', 'cardBuilder', 'dom', 'apphost', 'imageLoad
             });
         }
 
-        var i;
+        let elem = page.querySelector('.favoriteSections');
-        var length;
-        var elem = page.querySelector('.favoriteSections');
 
         if (!elem.innerHTML) {
-            var html = '';
+            let html = '';
 
-            for (i = 0, length = sections.length; i < length; i++) {
+            for (let i = 0, length = sections.length; i < length; i++) {
                 html += '<div class="verticalSection section' + sections[i].id + '"></div>';
             }
 
             elem.innerHTML = html;
         }
 
-        var promises = [];
+        const promises = [];
 
-        for (i = 0, length = sections.length; i < length; i++) {
+        for (let i = 0, length = sections.length; i < length; i++) {
-            var section = sections[i];
+            const section = sections[i];
             elem = page.querySelector('.section' + section.id);
             promises.push(loadSection(elem, userId, topParentId, section, sections.length === 1));
         }
@@ -223,7 +230,8 @@ define(['loading', 'libraryBrowser', 'cardBuilder', 'dom', 'apphost', 'imageLoad
         });
     }
 
-    return {
+export default {
-        render: loadSections
+    render: loadSections
-    };
+};
-});
+
+/* eslint-enable indent */

src/components/guide/guide.js

@@ -1,6 +1,8 @@
 define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', 'scrollHelper', 'serverNotifications', 'loading', 'datetime', 'focusManager', 'playbackManager', 'userSettings', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'dom', 'css!./guide.css', 'programStyles', 'material-icons', 'scrollStyles', 'emby-programcell', 'emby-button', 'paper-icon-button-light', 'emby-tabs', 'emby-scroller', 'flexStyles', 'webcomponents'], function (require, inputManager, browser, globalize, connectionManager, scrollHelper, serverNotifications, loading, datetime, focusManager, playbackManager, userSettings, imageLoader, events, layoutManager, itemShortcuts, dom) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function showViewSettings(instance) {
         require(['guide-settings-dialog'], function (guideSettingsDialog) {
             guideSettingsDialog.show(instance.categoryOptions).then(function () {

src/components/imageeditor/imageeditor.js

@@ -19,6 +19,8 @@ import 'css!./imageeditor';
 
     const enableFocusTransform = !browser.slow && !browser.edge;
 
+    loading = loading.default || loading;
+
     let currentItem;
     let hasChanges = false;
 

src/components/loading/loading.js

@@ -1,78 +1,74 @@
-define(['css!./loading'], function () {
+import 'css!./loading';
-    'use strict';
 
-    var loadingElem;
+let loadingElem;
-    var layer1;
+let layer1;
-    var layer2;
+let layer2;
-    var layer3;
+let layer3;
-    var layer4;
+let layer4;
-    var circleLefts;
+let circleLefts;
-    var circleRights;
+let circleRights;
 
-    return {
+export function show() {
-        show: function () {
+    let elem = loadingElem;
-            var elem = loadingElem;
 
-            if (!elem) {
+    if (!elem) {
-                elem = document.createElement('div');
+        elem = document.createElement('div');
-                loadingElem = elem;
+        loadingElem = elem;
 
-                elem.classList.add('docspinner');
+        elem.classList.add('docspinner');
-                elem.classList.add('mdl-spinner');
+        elem.classList.add('mdl-spinner');
 
-                elem.innerHTML = '<div class="mdl-spinner__layer mdl-spinner__layer-1"><div class="mdl-spinner__circle-clipper mdl-spinner__left"><div class="mdl-spinner__circle mdl-spinner__circleLeft"></div></div><div class="mdl-spinner__circle-clipper mdl-spinner__right"><div class="mdl-spinner__circle mdl-spinner__circleRight"></div></div></div><div class="mdl-spinner__layer mdl-spinner__layer-2"><div class="mdl-spinner__circle-clipper mdl-spinner__left"><div class="mdl-spinner__circle mdl-spinner__circleLeft"></div></div><div class="mdl-spinner__circle-clipper mdl-spinner__right"><div class="mdl-spinner__circle mdl-spinner__circleRight"></div></div></div><div class="mdl-spinner__layer mdl-spinner__layer-3"><div class="mdl-spinner__circle-clipper mdl-spinner__left"><div class="mdl-spinner__circle mdl-spinner__circleLeft"></div></div><div class="mdl-spinner__circle-clipper mdl-spinner__right"><div class="mdl-spinner__circle mdl-spinner__circleRight"></div></div></div><div class="mdl-spinner__layer mdl-spinner__layer-4"><div class="mdl-spinner__circle-clipper mdl-spinner__left"><div class="mdl-spinner__circle mdl-spinner__circleLeft"></div></div><div class="mdl-spinner__circle-clipper mdl-spinner__right"><div class="mdl-spinner__circle mdl-spinner__circleRight"></div></div></div>';
+        elem.innerHTML = '<div class="mdl-spinner__layer mdl-spinner__layer-1"><div class="mdl-spinner__circle-clipper mdl-spinner__left"><div class="mdl-spinner__circle mdl-spinner__circleLeft"></div></div><div class="mdl-spinner__circle-clipper mdl-spinner__right"><div class="mdl-spinner__circle mdl-spinner__circleRight"></div></div></div><div class="mdl-spinner__layer mdl-spinner__layer-2"><div class="mdl-spinner__circle-clipper mdl-spinner__left"><div class="mdl-spinner__circle mdl-spinner__circleLeft"></div></div><div class="mdl-spinner__circle-clipper mdl-spinner__right"><div class="mdl-spinner__circle mdl-spinner__circleRight"></div></div></div><div class="mdl-spinner__layer mdl-spinner__layer-3"><div class="mdl-spinner__circle-clipper mdl-spinner__left"><div class="mdl-spinner__circle mdl-spinner__circleLeft"></div></div><div class="mdl-spinner__circle-clipper mdl-spinner__right"><div class="mdl-spinner__circle mdl-spinner__circleRight"></div></div></div><div class="mdl-spinner__layer mdl-spinner__layer-4"><div class="mdl-spinner__circle-clipper mdl-spinner__left"><div class="mdl-spinner__circle mdl-spinner__circleLeft"></div></div><div class="mdl-spinner__circle-clipper mdl-spinner__right"><div class="mdl-spinner__circle mdl-spinner__circleRight"></div></div></div>';
 
-                document.body.appendChild(elem);
+        document.body.appendChild(elem);
 
-                layer1 = elem.querySelector('.mdl-spinner__layer-1');
+        layer1 = elem.querySelector('.mdl-spinner__layer-1');
-                layer2 = elem.querySelector('.mdl-spinner__layer-2');
+        layer2 = elem.querySelector('.mdl-spinner__layer-2');
-                layer3 = elem.querySelector('.mdl-spinner__layer-3');
+        layer3 = elem.querySelector('.mdl-spinner__layer-3');
-                layer4 = elem.querySelector('.mdl-spinner__layer-4');
+        layer4 = elem.querySelector('.mdl-spinner__layer-4');
 
-                circleLefts = elem.querySelectorAll('.mdl-spinner__circleLeft');
+        circleLefts = elem.querySelectorAll('.mdl-spinner__circleLeft');
-                circleRights = elem.querySelectorAll('.mdl-spinner__circleRight');
+        circleRights = elem.querySelectorAll('.mdl-spinner__circleRight');
-            }
+    }
 
-            elem.classList.add('mdlSpinnerActive');
+    elem.classList.add('mdlSpinnerActive');
 
-            layer1.classList.add('mdl-spinner__layer-1-active');
+    layer1.classList.add('mdl-spinner__layer-1-active');
-            layer2.classList.add('mdl-spinner__layer-2-active');
+    layer2.classList.add('mdl-spinner__layer-2-active');
-            layer3.classList.add('mdl-spinner__layer-3-active');
+    layer3.classList.add('mdl-spinner__layer-3-active');
-            layer4.classList.add('mdl-spinner__layer-4-active');
+    layer4.classList.add('mdl-spinner__layer-4-active');
 
-            var i;
+    for (let i = 0, length = circleLefts.length; i < length; i++) {
-            var length;
+        circleLefts[i].classList.add('mdl-spinner__circleLeft-active');
+    }
 
-            for (i = 0, length = circleLefts.length; i < length; i++) {
+    for (let i = 0, length = circleRights.length; i < length; i++) {
-                circleLefts[i].classList.add('mdl-spinner__circleLeft-active');
+        circleRights[i].classList.add('mdl-spinner__circleRight-active');
-            }
+    }
+}
 
-            for (i = 0, length = circleRights.length; i < length; i++) {
+export function hide() {
-                circleRights[i].classList.add('mdl-spinner__circleRight-active');
+    const elem = loadingElem;
-            }
-        },
-        hide: function () {
-            var elem = loadingElem;
 
-            if (elem) {
+    if (elem) {
-                elem.classList.remove('mdlSpinnerActive');
+        elem.classList.remove('mdlSpinnerActive');
 
-                elem.classList.remove('mdl-spinner__layer-1-active');
+        elem.classList.remove('mdl-spinner__layer-1-active');
-                elem.classList.remove('mdl-spinner__layer-2-active');
+        elem.classList.remove('mdl-spinner__layer-2-active');
-                elem.classList.remove('mdl-spinner__layer-3-active');
+        elem.classList.remove('mdl-spinner__layer-3-active');
-                elem.classList.remove('mdl-spinner__layer-4-active');
+        elem.classList.remove('mdl-spinner__layer-4-active');
 
-                var i;
+        for (let i = 0, length = circleLefts.length; i < length; i++) {
-                var length;
+            circleLefts[i].classList.remove('mdl-spinner__circleLeft-active');
-
-                for (i = 0, length = circleLefts.length; i < length; i++) {
-                    circleLefts[i].classList.remove('mdl-spinner__circleLeft-active');
-                }
-
-                for (i = 0, length = circleRights.length; i < length; i++) {
-                    circleRights[i].classList.remove('mdl-spinner__circleRight-active');
-                }
-            }
         }
-    };
+
-});
+        for (let i = 0, length = circleRights.length; i < length; i++) {
+            circleRights[i].classList.remove('mdl-spinner__circleRight-active');
+        }
+    }
+}
+
+export default {
+    show: show,
+    hide: hide
+};

src/components/playback/playbackmanager.js

@@ -1,6 +1,7 @@
 define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'playQueueManager', 'userSettings', 'globalize', 'connectionManager', 'loading', 'apphost', 'screenfull'], function (events, datetime, appSettings, itemHelper, pluginManager, PlayQueueManager, userSettings, globalize, connectionManager, loading, apphost, screenfull) {
     'use strict';
 
+    loading = loading.default || loading;
     PlayQueueManager = PlayQueueManager.default || PlayQueueManager;
 
     function enableLocalPlaylistManagement(player) {

src/components/recordingcreator/recordingeditor.js

@@ -1,6 +1,8 @@
 define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'connectionManager', 'require', 'loading', 'scrollHelper', 'imageLoader', 'scrollStyles', 'emby-button', 'emby-collapse', 'emby-input', 'paper-icon-button-light', 'css!./../formdialog', 'css!./recordingcreator', 'material-icons', 'flexStyles'], function (dialogHelper, globalize, layoutManager, mediaInfo, appHost, connectionManager, require, loading, scrollHelper, imageLoader) {
     'use strict';
 
+    loading = loading.default || loading;
+
     var currentDialog;
     var recordingDeleted = false;
     var currentItemId;

src/components/recordingcreator/recordingfields.js

@@ -1,6 +1,8 @@
 define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loading', 'apphost', 'dom', 'recordingHelper', 'events', 'paper-icon-button-light', 'emby-button', 'css!./recordingfields', 'flexStyles'], function (globalize, connectionManager, serverNotifications, require, loading, appHost, dom, recordingHelper, events) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function loadData(parent, program, apiClient) {
         if (program.IsSeries) {
             parent.querySelector('.recordSeriesContainer').classList.remove('hide');

src/components/recordingcreator/recordinghelper.js

@@ -1,6 +1,8 @@
 define(['globalize', 'loading', 'connectionManager'], function (globalize, loading, connectionManager) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function changeRecordingToSeries(apiClient, timerId, programId, confirmTimerCancellation) {
         loading.show();
 

src/components/recordingcreator/seriesrecordingeditor.js

@@ -1,6 +1,8 @@
 define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'connectionManager', 'require', 'loading', 'scrollHelper', 'imageLoader', 'datetime', 'scrollStyles', 'emby-button', 'emby-checkbox', 'emby-input', 'emby-select', 'paper-icon-button-light', 'css!./../formdialog', 'css!./recordingcreator', 'material-icons', 'flexStyles'], function (dialogHelper, globalize, layoutManager, mediaInfo, appHost, connectionManager, require, loading, scrollHelper, imageLoader, datetime) {
     'use strict';
 
+    loading = loading.default || loading;
+
     var currentDialog;
     var recordingUpdated = false;
     var recordingDeleted = false;

src/components/subtitleeditor/subtitleeditor.js

@@ -1,6 +1,8 @@
 define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings', 'connectionManager', 'loading', 'focusManager', 'dom', 'apphost', 'emby-select', 'listViewStyle', 'paper-icon-button-light', 'css!./../formdialog', 'material-icons', 'css!./subtitleeditor', 'emby-button', 'flexStyles'], function (dialogHelper, require, layoutManager, globalize, userSettings, connectionManager, loading, focusManager, dom, appHost) {
     'use strict';
 
+    loading = loading.default || loading;
+
     var currentItem;
     var hasChanges;
 

src/components/tunerPicker.js

@@ -1,6 +1,8 @@
 define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize', 'loading', 'browser', 'focusManager', 'scrollHelper', 'material-icons', 'formDialogStyle', 'emby-button', 'emby-itemscontainer', 'cardStyle'], function (dialogHelper, dom, layoutManager, connectionManager, globalize, loading, browser, focusManager, scrollHelper) {
     'use strict';
 
+    loading = loading.default || loading;
+
     var enableFocusTransform = !browser.slow && !browser.edge;
 
     function getEditorHtml() {

src/components/tvproviders/schedulesdirect.js

@@ -1,6 +1,8 @@
 define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'listViewStyle', 'emby-input', 'emby-select', 'emby-button', 'flexStyles'], function ($, loading, globalize) {
     'use strict';
 
+    loading = loading.default || loading;
+
     return function (page, providerId, options) {
         function reload() {
             loading.show();

src/components/tvproviders/xmltv.js

@@ -1,6 +1,8 @@
 define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'emby-input', 'listViewStyle', 'paper-icon-button-light'], function ($, loading, globalize) {
     'use strict';
 
+    loading = loading.default || loading;
+
     return function (page, providerId, options) {
         function getListingProvider(config, id) {
             if (config && id) {

src/controllers/dashboard/notifications/notifications/index.js

@@ -1,6 +1,8 @@
 define(['loading', 'libraryMenu', 'globalize', 'listViewStyle', 'emby-button'], function(loading, libraryMenu, globalize) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function reload(page) {
         loading.show();
         ApiClient.getJSON(ApiClient.getUrl('Notifications/Types')).then(function(list) {

src/controllers/dashboard/plugins/add/index.js

@@ -1,6 +1,8 @@
 define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'connectionManager', 'emby-button'], function ($, loading, libraryMenu, globalize, connectionManager) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function populateHistory(packageInfo, page) {
         var html = '';
         var length = Math.min(packageInfo.versions.length, 10);

src/controllers/dashboard/plugins/available/index.js

@@ -1,6 +1,8 @@
 define(['loading', 'libraryMenu', 'globalize', 'cardStyle', 'emby-button', 'emby-checkbox', 'emby-select'], function (loading, libraryMenu, globalize) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function reloadList(page) {
         loading.show();
         var promise1 = ApiClient.getAvailablePlugins();

src/controllers/dashboard/plugins/installed/index.js

@@ -1,6 +1,8 @@
 define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'], function (loading, libraryMenu, dom, globalize) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function deletePlugin(page, uniqueid, name) {
         var msg = globalize.translate('UninstallPluginConfirmation', name);
 

src/controllers/edititemmetadata.js

@@ -1,6 +1,8 @@
 define(['loading', 'scripts/editorsidebar'], function (loading) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function reload(context, itemId) {
         loading.show();
 

src/controllers/hometab.js

@@ -1,6 +1,8 @@
 define(['userSettings', 'loading', 'connectionManager', 'apphost', 'layoutManager', 'focusManager', 'homeSections', 'emby-itemscontainer'], function (userSettings, loading, connectionManager, appHost, layoutManager, focusManager, homeSections) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function HomeTab(view, params) {
         this.view = view;
         this.params = params;

src/controllers/itemDetails/index.js

@@ -29,6 +29,8 @@ import 'emby-select';
 
 /* eslint-disable indent */
 
+    loading = loading.default || loading;
+
     function getPromise(apiClient, params) {
         const id = params.id;
 

src/controllers/list.js

@@ -1,6 +1,8 @@
 define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager', 'cardBuilder', 'loading', 'connectionManager', 'alphaNumericShortcuts', 'scroller', 'playbackManager', 'alphaPicker', 'emby-itemscontainer', 'emby-scroller'], function (globalize, listView, layoutManager, userSettings, focusManager, cardBuilder, loading, connectionManager, AlphaNumericShortcuts, scroller, playbackManager, AlphaPicker) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function getInitialLiveTvQuery(instance, params) {
         var query = {
             UserId: connectionManager.getApiClient(params.serverId).getCurrentUserId(),

src/controllers/livetv/livetvchannels.js

@@ -1,6 +1,7 @@
 define(['cardBuilder', 'imageLoader', 'libraryBrowser', 'loading', 'events', 'userSettings', 'emby-itemscontainer'], function (cardBuilder, imageLoader, libraryBrowser, loading, events, userSettings) {
     'use strict';
 
+    loading = loading.default || loading;
     libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent) {

src/controllers/livetv/livetvrecordings.js

@@ -1,6 +1,8 @@
 define(['layoutManager', 'loading', 'cardBuilder', 'apphost', 'imageLoader', 'scripts/livetvcomponents', 'listViewStyle', 'emby-itemscontainer'], function (layoutManager, loading, cardBuilder, appHost, imageLoader) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function renderRecordings(elem, recordings, cardOptions, scrollX) {
         if (!elem) {
             return;

src/controllers/livetv/livetvschedule.js

@@ -1,6 +1,8 @@
 define(['layoutManager', 'cardBuilder', 'apphost', 'imageLoader', 'loading', 'scripts/livetvcomponents', 'emby-button', 'emby-itemscontainer'], function (layoutManager, cardBuilder, appHost, imageLoader, loading) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function enableScrollX() {
         return !layoutManager.desktop;
     }

src/controllers/livetv/livetvseriestimers.js

@@ -1,6 +1,8 @@
 define(['datetime', 'cardBuilder', 'imageLoader', 'apphost', 'loading', 'paper-icon-button-light', 'emby-button'], function (datetime, cardBuilder, imageLoader, appHost, loading) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function renderTimers(context, timers) {
         var html = '';
         html += cardBuilder.getCardsHtml({

src/controllers/livetv/livetvsuggested.js

@@ -1,6 +1,8 @@
 define(['layoutManager', 'userSettings', 'inputManager', 'loading', 'globalize', 'libraryBrowser', 'mainTabsManager', 'cardBuilder', 'apphost', 'imageLoader', 'scrollStyles', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (layoutManager, userSettings, inputManager, loading, globalize, libraryBrowser, mainTabsManager, cardBuilder, appHost, imageLoader) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function enableScrollX() {
         return !layoutManager.desktop;
     }

src/controllers/livetvguideprovider.js

@@ -1,6 +1,8 @@
 define(['events', 'loading', 'globalize'], function (events, loading, globalize) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function onListingsSubmitted() {
         Dashboard.navigate('livetvstatus.html');
     }

src/controllers/livetvsettings.js

@@ -1,6 +1,8 @@
 define(['jQuery', 'loading', 'globalize', 'emby-button'], function ($, loading, globalize) {
     'use strict';
 
+    loading = loading.default || loading;
+
     function loadPage(page, config) {
         $('.liveTvSettingsForm', page).show();
         $('.noLiveTvServices', page).hide();

src/controllers/movies/moviecollections.js

@@ -1,6 +1,7 @@
 define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardBuilder', 'userSettings', 'globalize', 'emby-itemscontainer'], function (loading, events, libraryBrowser, imageLoader, listView, cardBuilder, userSettings, globalize) {
     'use strict';
 
+    loading = loading.default || loading;
     libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent) {

src/controllers/movies/moviegenres.js

@@ -1,6 +1,7 @@
 define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader', 'apphost', 'globalize', 'appRouter', 'dom', 'emby-button'], function (layoutManager, loading, libraryBrowser, cardBuilder, lazyLoader, appHost, globalize, appRouter, dom) {
     'use strict';
 
+    loading = loading.default || loading;
     libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent) {

src/controllers/movies/movies.js

@@ -1,6 +1,7 @@
 define(['loading', 'layoutManager', 'userSettings', 'events', 'libraryBrowser', 'alphaPicker', 'listView', 'cardBuilder', 'globalize', 'emby-itemscontainer'], function (loading, layoutManager, userSettings, events, libraryBrowser, AlphaPicker, listView, cardBuilder, globalize) {
     'use strict';
 
+    loading = loading.default || loading;
     libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent, options) {

src/controllers/movies/movietrailers.js

@@ -1,6 +1,7 @@
 define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'userSettings', 'globalize', 'emby-itemscontainer'], function (layoutManager, loading, events, libraryBrowser, imageLoader, AlphaPicker, listView, cardBuilder, userSettings, globalize) {
     'use strict';
 
+    loading = loading.default || loading;
     libraryBrowser = libraryBrowser.default || libraryBrowser;
 
     return function (view, params, tabContent) {