', !layoutManager.tv && options.Limit && result.Items.length >= options.Limit) {
@@ -144,7 +153,7 @@ define(['loading', 'libraryBrowser', 'cardBuilder', 'dom', 'apphost', 'imageLoad
html += '
';
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 += '';
}
- 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();
- var sectionid = getParameterByName('sectionid');
+ let sections = getSections();
+ const sectionid = getParameterByName('sectionid');
if (sectionid) {
sections = sections.filter(function (s) {
@@ -196,24 +205,22 @@ define(['loading', 'libraryBrowser', 'cardBuilder', 'dom', 'apphost', 'imageLoad
});
}
- var i;
- var length;
- var elem = page.querySelector('.favoriteSections');
+ let 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 += '
';
}
elem.innerHTML = html;
}
- var promises = [];
+ const promises = [];
- for (i = 0, length = sections.length; i < length; i++) {
- var section = sections[i];
+ for (let i = 0, length = sections.length; i < length; 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 {
- render: loadSections
- };
-});
+export default {
+ render: loadSections
+};
+
+/* eslint-enable indent */
diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js
index bd3ad89aaa..abc7d81fee 100644
--- a/src/components/guide/guide.js
+++ b/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 () {
diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js
index 78c35bb15f..c0394ed2ad 100644
--- a/src/components/imageeditor/imageeditor.js
+++ b/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;
diff --git a/src/components/loading/loading.js b/src/components/loading/loading.js
index 9f86ba452f..8237611373 100644
--- a/src/components/loading/loading.js
+++ b/src/components/loading/loading.js
@@ -1,78 +1,74 @@
-define(['css!./loading'], function () {
- 'use strict';
+import 'css!./loading';
- var loadingElem;
- var layer1;
- var layer2;
- var layer3;
- var layer4;
- var circleLefts;
- var circleRights;
+let loadingElem;
+let layer1;
+let layer2;
+let layer3;
+let layer4;
+let circleLefts;
+let circleRights;
- return {
- show: function () {
- var elem = loadingElem;
+export function show() {
+ let elem = loadingElem;
- if (!elem) {
- elem = document.createElement('div');
- loadingElem = elem;
+ if (!elem) {
+ elem = document.createElement('div');
+ loadingElem = elem;
- elem.classList.add('docspinner');
- elem.classList.add('mdl-spinner');
+ elem.classList.add('docspinner');
+ elem.classList.add('mdl-spinner');
- elem.innerHTML = '
';
+ elem.innerHTML = '
';
- document.body.appendChild(elem);
+ document.body.appendChild(elem);
- layer1 = elem.querySelector('.mdl-spinner__layer-1');
- layer2 = elem.querySelector('.mdl-spinner__layer-2');
- layer3 = elem.querySelector('.mdl-spinner__layer-3');
- layer4 = elem.querySelector('.mdl-spinner__layer-4');
+ layer1 = elem.querySelector('.mdl-spinner__layer-1');
+ layer2 = elem.querySelector('.mdl-spinner__layer-2');
+ layer3 = elem.querySelector('.mdl-spinner__layer-3');
+ layer4 = elem.querySelector('.mdl-spinner__layer-4');
- circleLefts = elem.querySelectorAll('.mdl-spinner__circleLeft');
- circleRights = elem.querySelectorAll('.mdl-spinner__circleRight');
- }
+ circleLefts = elem.querySelectorAll('.mdl-spinner__circleLeft');
+ circleRights = elem.querySelectorAll('.mdl-spinner__circleRight');
+ }
- elem.classList.add('mdlSpinnerActive');
+ elem.classList.add('mdlSpinnerActive');
- layer1.classList.add('mdl-spinner__layer-1-active');
- layer2.classList.add('mdl-spinner__layer-2-active');
- layer3.classList.add('mdl-spinner__layer-3-active');
- layer4.classList.add('mdl-spinner__layer-4-active');
+ layer1.classList.add('mdl-spinner__layer-1-active');
+ layer2.classList.add('mdl-spinner__layer-2-active');
+ layer3.classList.add('mdl-spinner__layer-3-active');
+ layer4.classList.add('mdl-spinner__layer-4-active');
- var i;
- var length;
+ for (let i = 0, length = circleLefts.length; i < length; i++) {
+ circleLefts[i].classList.add('mdl-spinner__circleLeft-active');
+ }
- for (i = 0, length = circleLefts.length; i < length; i++) {
- circleLefts[i].classList.add('mdl-spinner__circleLeft-active');
- }
+ for (let i = 0, length = circleRights.length; i < length; i++) {
+ circleRights[i].classList.add('mdl-spinner__circleRight-active');
+ }
+}
- for (i = 0, length = circleRights.length; i < length; i++) {
- circleRights[i].classList.add('mdl-spinner__circleRight-active');
- }
- },
- hide: function () {
- var elem = loadingElem;
+export function hide() {
+ const elem = loadingElem;
- if (elem) {
- elem.classList.remove('mdlSpinnerActive');
+ if (elem) {
+ elem.classList.remove('mdlSpinnerActive');
- elem.classList.remove('mdl-spinner__layer-1-active');
- elem.classList.remove('mdl-spinner__layer-2-active');
- elem.classList.remove('mdl-spinner__layer-3-active');
- elem.classList.remove('mdl-spinner__layer-4-active');
+ elem.classList.remove('mdl-spinner__layer-1-active');
+ elem.classList.remove('mdl-spinner__layer-2-active');
+ elem.classList.remove('mdl-spinner__layer-3-active');
+ elem.classList.remove('mdl-spinner__layer-4-active');
- var i;
- var length;
-
- 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 = circleLefts.length; i < length; i++) {
+ circleLefts[i].classList.remove('mdl-spinner__circleLeft-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
+};
diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 1d74cd69f5..3c6394db79 100644
--- a/src/components/playback/playbackmanager.js
+++ b/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) {
diff --git a/src/components/recordingcreator/recordingeditor.js b/src/components/recordingcreator/recordingeditor.js
index 3797cde370..2086129a9e 100644
--- a/src/components/recordingcreator/recordingeditor.js
+++ b/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;
diff --git a/src/components/recordingcreator/recordingfields.js b/src/components/recordingcreator/recordingfields.js
index 2534eafe6a..e3739f1cfe 100644
--- a/src/components/recordingcreator/recordingfields.js
+++ b/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');
diff --git a/src/components/recordingcreator/recordinghelper.js b/src/components/recordingcreator/recordinghelper.js
index 4a0bdd9b01..5d72394282 100644
--- a/src/components/recordingcreator/recordinghelper.js
+++ b/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();
diff --git a/src/components/recordingcreator/seriesrecordingeditor.js b/src/components/recordingcreator/seriesrecordingeditor.js
index ea20c7267d..b115e273e6 100644
--- a/src/components/recordingcreator/seriesrecordingeditor.js
+++ b/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;
diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js
index 37f767524e..7df24b5da8 100644
--- a/src/components/subtitleeditor/subtitleeditor.js
+++ b/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;
diff --git a/src/components/tunerPicker.js b/src/components/tunerPicker.js
index e7c92851a4..de5c4cf186 100644
--- a/src/components/tunerPicker.js
+++ b/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() {
diff --git a/src/components/tvproviders/schedulesdirect.js b/src/components/tvproviders/schedulesdirect.js
index 6f89702012..a0c29f48b8 100644
--- a/src/components/tvproviders/schedulesdirect.js
+++ b/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();
diff --git a/src/components/tvproviders/xmltv.js b/src/components/tvproviders/xmltv.js
index 5c75a09cdd..2203bc1fea 100644
--- a/src/components/tvproviders/xmltv.js
+++ b/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) {
diff --git a/src/controllers/dashboard/notifications/notifications/index.js b/src/controllers/dashboard/notifications/notifications/index.js
index 4e049bc106..c2cf9d83c3 100644
--- a/src/controllers/dashboard/notifications/notifications/index.js
+++ b/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) {
diff --git a/src/controllers/dashboard/plugins/add/index.js b/src/controllers/dashboard/plugins/add/index.js
index a3c450dd79..c20b7832cd 100644
--- a/src/controllers/dashboard/plugins/add/index.js
+++ b/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);
diff --git a/src/controllers/dashboard/plugins/available/index.js b/src/controllers/dashboard/plugins/available/index.js
index e27a3298da..e38365ef55 100644
--- a/src/controllers/dashboard/plugins/available/index.js
+++ b/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();
diff --git a/src/controllers/dashboard/plugins/installed/index.js b/src/controllers/dashboard/plugins/installed/index.js
index d28a04cb2b..3131386b2b 100644
--- a/src/controllers/dashboard/plugins/installed/index.js
+++ b/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);
diff --git a/src/controllers/edititemmetadata.js b/src/controllers/edititemmetadata.js
index 1a3647a758..b0f1f4a142 100644
--- a/src/controllers/edititemmetadata.js
+++ b/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();
diff --git a/src/controllers/hometab.js b/src/controllers/hometab.js
index 8e2a1f92e7..97034d4505 100644
--- a/src/controllers/hometab.js
+++ b/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;
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index df2855d69a..c65ce39d84 100644
--- a/src/controllers/itemDetails/index.js
+++ b/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;
diff --git a/src/controllers/list.js b/src/controllers/list.js
index 01ef35a26a..7ccab39a8d 100644
--- a/src/controllers/list.js
+++ b/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(),
diff --git a/src/controllers/livetv/livetvchannels.js b/src/controllers/livetv/livetvchannels.js
index 3ceda7d476..f5a0abeb38 100644
--- a/src/controllers/livetv/livetvchannels.js
+++ b/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) {
diff --git a/src/controllers/livetv/livetvrecordings.js b/src/controllers/livetv/livetvrecordings.js
index d832ca1339..b0259bc89b 100644
--- a/src/controllers/livetv/livetvrecordings.js
+++ b/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;
diff --git a/src/controllers/livetv/livetvschedule.js b/src/controllers/livetv/livetvschedule.js
index 2f451e50fb..4427bef5d1 100644
--- a/src/controllers/livetv/livetvschedule.js
+++ b/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;
}
diff --git a/src/controllers/livetv/livetvseriestimers.js b/src/controllers/livetv/livetvseriestimers.js
index c5d0da60d7..62f36a1006 100644
--- a/src/controllers/livetv/livetvseriestimers.js
+++ b/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({
diff --git a/src/controllers/livetv/livetvsuggested.js b/src/controllers/livetv/livetvsuggested.js
index 36ba825a34..79d9aac6e9 100644
--- a/src/controllers/livetv/livetvsuggested.js
+++ b/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;
}
diff --git a/src/controllers/livetvguideprovider.js b/src/controllers/livetvguideprovider.js
index 8f8b9f91c7..3ec04fd2af 100644
--- a/src/controllers/livetvguideprovider.js
+++ b/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');
}
diff --git a/src/controllers/livetvsettings.js b/src/controllers/livetvsettings.js
index 715eb06214..33034295b5 100644
--- a/src/controllers/livetvsettings.js
+++ b/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();
diff --git a/src/controllers/movies/moviecollections.js b/src/controllers/movies/moviecollections.js
index dc8fae3a7b..7c1a5156d9 100644
--- a/src/controllers/movies/moviecollections.js
+++ b/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) {
diff --git a/src/controllers/movies/moviegenres.js b/src/controllers/movies/moviegenres.js
index 07334b4d91..82ab4d4d4b 100644
--- a/src/controllers/movies/moviegenres.js
+++ b/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) {
diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js
index f4c126c468..ade9dc4b89 100644
--- a/src/controllers/movies/movies.js
+++ b/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) {
diff --git a/src/controllers/movies/movietrailers.js b/src/controllers/movies/movietrailers.js
index 84d7c538ee..8d9fe8d090 100644
--- a/src/controllers/movies/movietrailers.js
+++ b/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) {