Merge pull request #1762 from Camc314/migrate-to-ES6-62

Migration of recordinghelper and seriesrecordingeditor to ES6 modules

package.json

@@ -153,6 +153,8 @@
           "src/components/playlisteditor/playlisteditor.js",
           "src/components/playmenu.js",
           "src/components/prompt/prompt.js",
+          "src/components/recordingcreator/seriesrecordingeditor.js",
+          "src/components/recordingcreator/recordinghelper.js",
           "src/components/refreshdialog/refreshdialog.js",
           "src/components/sanatizefilename.js",
           "src/components/scrollManager.js",

src/components/recordingcreator/recordingbutton.js

@@ -1,6 +1,8 @@
 define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom', 'recordingHelper', 'events', 'paper-icon-button-light', 'emby-button', 'css!./recordingfields'], function (globalize, connectionManager, require, loading, appHost, dom, recordingHelper, events) {
     'use strict';
 
+    recordingHelper = recordingHelper.default || recordingHelper;
+
     function onRecordingButtonClick(e) {
         var item = this.item;
 

src/components/recordingcreator/recordingeditor.js

@@ -12,6 +12,8 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     function deleteTimer(apiClient, timerId) {
         return new Promise(function (resolve, reject) {
             require(['recordingHelper'], function (recordingHelper) {
+                recordingHelper = recordingHelper.default || recordingHelper;
+
                 recordingHelper.cancelTimerWithConfirmation(timerId, apiClient.serverId()).then(resolve, reject);
             });
         });

src/components/recordingcreator/recordingfields.js

@@ -1,6 +1,7 @@
 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';
 
+    recordingHelper = recordingHelper.default || recordingHelper;
     loading = loading.default || loading;
 
     function loadData(parent, program, apiClient) {

src/components/recordingcreator/recordinghelper.js

@@ -1,9 +1,10 @@
-define(['globalize', 'loading', 'connectionManager'], function (globalize, loading, connectionManager) {
+import globalize from 'globalize';
-    'use strict';
+import loading from 'loading';
+import connectionManager from 'connectionManager';
 
-    loading = loading.default || loading;
+/*eslint prefer-const: "error"*/
 
-    function changeRecordingToSeries(apiClient, timerId, programId, confirmTimerCancellation) {
+function changeRecordingToSeries(apiClient, timerId, programId, confirmTimerCancellation) {
     loading.show();
 
     return apiClient.getItem(apiClient.getCurrentUserId(), programId).then(function (item) {
@@ -24,11 +25,11 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
             return cancelTimer(apiClient.serverId(), timerId, true);
         }
     });
-    }
+}
 
-    function cancelTimerWithConfirmation(timerId, serverId) {
+function cancelTimerWithConfirmation(timerId, serverId) {
     return new Promise(function (resolve, reject) {
-            require(['confirm'], function (confirm) {
+        import('confirm').then(({ default: confirm }) => {
             confirm.default({
 
                 text: globalize.translate('MessageConfirmRecordingCancellation'),
@@ -39,16 +40,16 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
             }).then(function () {
                 loading.show();
 
-                    var apiClient = connectionManager.getApiClient(serverId);
+                const apiClient = connectionManager.getApiClient(serverId);
                 cancelTimer(apiClient, timerId, true).then(resolve, reject);
             }, reject);
         });
     });
-    }
+}
 
-    function cancelSeriesTimerWithConfirmation(timerId, serverId) {
+function cancelSeriesTimerWithConfirmation(timerId, serverId) {
     return new Promise(function (resolve, reject) {
-            require(['confirm'], function (confirm) {
+        import('confirm').then(({ default: confirm }) => {
             confirm.default({
 
                 text: globalize.translate('MessageConfirmRecordingCancellation'),
@@ -59,9 +60,9 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
             }).then(function () {
                 loading.show();
 
-                    var apiClient = connectionManager.getApiClient(serverId);
+                const apiClient = connectionManager.getApiClient(serverId);
                 apiClient.cancelLiveTvSeriesTimer(timerId).then(function () {
-                        require(['toast'], function (toast) {
+                    import('toast').then(({default: toast}) => {
                         toast(globalize.translate('SeriesCancelled'));
                     });
 
@@ -71,9 +72,9 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
             }, reject);
         });
     });
-    }
+}
 
-    function cancelTimer(apiClient, timerId, hideLoading) {
+function cancelTimer(apiClient, timerId, hideLoading) {
     loading.show();
     return apiClient.cancelLiveTvTimer(timerId).then(function () {
         if (hideLoading !== false) {
@@ -81,12 +82,12 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
             sendToast(globalize.translate('RecordingCancelled'));
         }
     });
-    }
+}
 
-    function createRecording(apiClient, programId, isSeries) {
+function createRecording(apiClient, programId, isSeries) {
     loading.show();
     return apiClient.getNewLiveTvTimerDefaults({ programId: programId }).then(function (item) {
-            var promise = isSeries ?
+        const promise = isSeries ?
             apiClient.createLiveTvSeriesTimer(item) :
             apiClient.createLiveTvTimer(item);
 
@@ -95,18 +96,18 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
             sendToast(globalize.translate('RecordingScheduled'));
         });
     });
-    }
+}
 
-    function sendToast(msg) {
+function sendToast(msg) {
-        require(['toast'], function (toast) {
+    import('toast').then(({ default: toast }) => {
         toast(msg);
     });
-    }
+}
 
-    function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus, seriesTimerId) {
+function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus, seriesTimerId) {
     return new Promise(function (resolve, reject) {
-            require(['dialog'], function (dialog) {
+        import('dialog').then(({ default: dialog }) => {
-                var items = [];
+            const items = [];
 
             items.push({
                 name: globalize.translate('HeaderKeepRecording'),
@@ -140,7 +141,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
                 buttons: items
 
             }).then(function (result) {
-                    var apiClient = connectionManager.getApiClient(serverId);
+                const apiClient = connectionManager.getApiClient(serverId);
 
                 if (result === 'canceltimer') {
                     loading.show();
@@ -150,7 +151,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
                     loading.show();
 
                     apiClient.cancelLiveTvSeriesTimer(seriesTimerId).then(function () {
-                            require(['toast'], function (toast) {
+                        import('toast').then(({ default: toast }) => {
                             toast(globalize.translate('SeriesCancelled'));
                         });
 
@@ -163,11 +164,11 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
             }, reject);
         });
     });
-    }
+}
 
-    function toggleRecording(serverId, programId, timerId, timerStatus, seriesTimerId) {
+function toggleRecording(serverId, programId, timerId, timerStatus, seriesTimerId) {
-        var apiClient = connectionManager.getApiClient(serverId);
+    const apiClient = connectionManager.getApiClient(serverId);
-        var hasTimer = timerId && timerStatus !== 'Cancelled';
+    const hasTimer = timerId && timerStatus !== 'Cancelled';
     if (seriesTimerId && hasTimer) {
         // cancel
         return showMultiCancellationPrompt(serverId, programId, timerId, timerStatus, seriesTimerId);
@@ -181,14 +182,14 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
     } else {
         return Promise.reject();
     }
-    }
+}
 
-    return {
+export default {
     cancelTimer: cancelTimer,
     createRecording: createRecording,
     changeRecordingToSeries: changeRecordingToSeries,
     toggleRecording: toggleRecording,
     cancelTimerWithConfirmation: cancelTimerWithConfirmation,
     cancelSeriesTimerWithConfirmation: cancelSeriesTimerWithConfirmation
-    };
+};
-});
+

src/components/recordingcreator/seriesrecordingeditor.js

@@ -1,23 +1,38 @@
-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) {
+import dialogHelper from 'dialogHelper';
-    'use strict';
+import globalize from 'globalize';
+import layoutManager from 'layoutManager';
+import connectionManager from 'connectionManager';
+import loading from 'loading';
+import scrollHelper from 'scrollHelper';
+import datetime from 'datetime';
+import 'scrollStyles';
+import 'emby-button';
+import 'emby-checkbox';
+import 'emby-input';
+import 'emby-select';
+import 'paper-icon-button-light';
+import 'css!./../formdialog';
+import 'css!./recordingcreator';
+import 'material-icons';
+import 'flexStyles';
 
-    loading = loading.default || loading;
+/*eslint prefer-const: "error"*/
 
-    var currentDialog;
+let currentDialog;
-    var recordingUpdated = false;
+let recordingUpdated = false;
-    var recordingDeleted = false;
+let recordingDeleted = false;
-    var currentItemId;
+let currentItemId;
-    var currentServerId;
+let currentServerId;
 
-    function deleteTimer(apiClient, timerId) {
+function deleteTimer(apiClient, timerId) {
     return new Promise(function (resolve, reject) {
-            require(['recordingHelper'], function (recordingHelper) {
+        import('recordingHelper').then(({ default: recordingHelper }) => {
             recordingHelper.cancelSeriesTimerWithConfirmation(timerId, apiClient.serverId()).then(resolve, reject);
         });
     });
-    }
+}
 
-    function renderTimer(context, item, apiClient) {
+function renderTimer(context, item) {
     context.querySelector('#txtPrePaddingMinutes').value = item.PrePaddingSeconds / 60;
     context.querySelector('#txtPostPaddingMinutes').value = item.PostPaddingSeconds / 60;
 
@@ -37,19 +52,19 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     context.querySelector('.optionAroundTime').innerHTML = globalize.translate('AroundTime', datetime.getDisplayTime(datetime.parseISO8601Date(item.StartDate)));
 
     loading.hide();
-    }
+}
 
-    function closeDialog(isDeleted) {
+function closeDialog(isDeleted) {
     recordingUpdated = true;
     recordingDeleted = isDeleted;
 
     dialogHelper.close(currentDialog);
-    }
+}
 
-    function onSubmit(e) {
+function onSubmit(e) {
-        var form = this;
+    const form = this;
 
-        var apiClient = connectionManager.getApiClient(currentServerId);
+    const apiClient = connectionManager.getApiClient(currentServerId);
 
     apiClient.getLiveTvSeriesTimer(currentItemId).then(function (item) {
         item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
@@ -67,9 +82,9 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
 
     // Disable default form submission
     return false;
-    }
+}
 
-    function init(context) {
+function init(context) {
     fillKeepUpTo(context);
 
     context.querySelector('.btnCancel').addEventListener('click', function () {
@@ -77,39 +92,39 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     });
 
     context.querySelector('.btnCancelRecording').addEventListener('click', function () {
-            var apiClient = connectionManager.getApiClient(currentServerId);
+        const apiClient = connectionManager.getApiClient(currentServerId);
         deleteTimer(apiClient, currentItemId).then(function () {
             closeDialog(true);
         });
     });
 
     context.querySelector('form').addEventListener('submit', onSubmit);
-    }
+}
 
-    function reload(context, id) {
+function reload(context, id) {
-        var apiClient = connectionManager.getApiClient(currentServerId);
+    const apiClient = connectionManager.getApiClient(currentServerId);
 
     loading.show();
     if (typeof id === 'string') {
         currentItemId = id;
 
         apiClient.getLiveTvSeriesTimer(id).then(function (result) {
-                renderTimer(context, result, apiClient);
+            renderTimer(context, result);
             loading.hide();
         });
     } else if (id) {
         currentItemId = id.Id;
 
-            renderTimer(context, id, apiClient);
+        renderTimer(context, id);
         loading.hide();
     }
-    }
+}
 
-    function fillKeepUpTo(context) {
+function fillKeepUpTo(context) {
-        var html = '';
+    let html = '';
 
-        for (var i = 0; i <= 50; i++) {
+    for (let i = 0; i <= 50; i++) {
-            var text;
+        let text;
 
         if (i === 0) {
             text = globalize.translate('AsManyAsPossible');
@@ -123,21 +138,21 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     context.querySelector('.selectKeepUpTo').innerHTML = html;
-    }
+}
 
-    function onFieldChange(e) {
+function onFieldChange() {
     this.querySelector('.btnSubmit').click();
-    }
+}
 
-    function embed(itemId, serverId, options) {
+function embed(itemId, serverId, options) {
     recordingUpdated = false;
     recordingDeleted = false;
     currentServerId = serverId;
     loading.show();
     options = options || {};
 
-        require(['text!./seriesrecordingeditor.template.html'], function (template) {
+    import('text!./seriesrecordingeditor.template.html').then(({ default: template }) => {
-            var dialogOptions = {
+        const dialogOptions = {
             removeOnClose: true,
             scrollY: false
         };
@@ -148,7 +163,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
             dialogOptions.size = 'small';
         }
 
-            var dlg = options.context;
+        const dlg = options.context;
 
         dlg.classList.add('hide');
         dlg.innerHTML = globalize.translateHtml(template, 'core');
@@ -168,9 +183,9 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
 
         reload(dlg, itemId);
     });
-    }
+}
 
-    function showEditor(itemId, serverId, options) {
+function showEditor(itemId, serverId, options) {
     return new Promise(function (resolve, reject) {
         recordingUpdated = false;
         recordingDeleted = false;
@@ -178,8 +193,8 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
         loading.show();
         options = options || {};
 
-            require(['text!./seriesrecordingeditor.template.html'], function (template) {
+        import('text!./seriesrecordingeditor.template.html').then(({ default: template }) => {
-                var dialogOptions = {
+            const dialogOptions = {
                 removeOnClose: true,
                 scrollY: false
             };
@@ -190,7 +205,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
                 dialogOptions.size = 'small';
             }
 
-                var dlg = dialogHelper.createDialog(dialogOptions);
+            const dlg = dialogHelper.createDialog(dialogOptions);
 
             dlg.classList.add('formDialog');
             dlg.classList.add('recordingDialog');
@@ -199,7 +214,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
                 dlg.style['min-width'] = '20%';
             }
 
-                var html = '';
+            let html = '';
 
             html += globalize.translateHtml(template, 'core');
 
@@ -239,10 +254,9 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
             dialogHelper.open(dlg);
         });
     });
-    }
+}
 
-    return {
+export default {
     show: showEditor,
     embed: embed
-    };
+};
-});