migration of display, home, playback and subtitles to ES6 modules

package.json

@@ -116,6 +116,10 @@
           "src/components/syncPlay/timeSyncManager.js",
           "src/controllers/dashboard/logs.js",
           "src/controllers/dashboard/plugins/repositories.js",
+          "src/controllers/user/display.js",
+          "src/controllers/user/home.js",
+          "src/controllers/user/playback.js",
+          "src/controllers/user/subtitles.js",
           "src/plugins/bookPlayer/plugin.js",
           "src/plugins/bookPlayer/tableOfContents.js",
           "src/plugins/photoPlayer/plugin.js",

src/controllers/user/display.js

@@ -1,10 +1,13 @@
-define(['displaySettings', 'userSettings', 'autoFocuser'], function (DisplaySettings, userSettings, autoFocuser) {
+import DisplaySettings from 'displaySettings';
-    'use strict';
+import * as userSettings from 'userSettings';
+import autoFocuser from 'autoFocuser';
+
+/* eslint-disable indent */
 
     // Shortcuts
     const UserSettings = userSettings.UserSettings;
 
-    return function (view, params) {
+    export default function (view, params) {
         function onBeforeUnload(e) {
             if (hasChanges) {
                 e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
@@ -26,8 +29,8 @@ define(['displaySettings', 'userSettings', 'autoFocuser'], function (DisplaySett
                     userId: userId,
                     element: view.querySelector('.settingsContainer'),
                     userSettings: currentSettings,
-                    enableSaveButton: false,
+                    enableSaveButton: true,
-                    enableSaveConfirmation: false,
+                    enableSaveConfirmation: true,
                     autoFocus: autoFocuser.isEnabled()
                 });
             }
@@ -49,5 +52,6 @@ define(['displaySettings', 'userSettings', 'autoFocuser'], function (DisplaySett
                 settingsInstance = null;
             }
         });
-    };
+    }
-});
+
+/* eslint-enable indent */

src/controllers/user/home.js

@@ -1,10 +1,17 @@
-define(['homescreenSettings', 'dom', 'globalize', 'loading', 'userSettings', 'autoFocuser', 'listViewStyle'], function (HomescreenSettings, dom, globalize, loading, userSettings, autoFocuser) {
+import HomescreenSettings from 'homescreenSettings';
-    'use strict';
+import dom from 'dom';
+import globalize from 'globalize';
+import loading from 'loading';
+import * as userSettings from 'userSettings';
+import autoFocuser from 'autoFocuser';
+import 'listViewStyle';
+
+/* eslint-disable indent */
 
     // Shortcuts
     const UserSettings = userSettings.UserSettings;
 
-    return function (view, params) {
+    export default function (view, params) {
         function onBeforeUnload(e) {
             if (hasChanges) {
                 e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
@@ -26,8 +33,8 @@ define(['homescreenSettings', 'dom', 'globalize', 'loading', 'userSettings', 'au
                     userId: userId,
                     element: view.querySelector('.homeScreenSettingsContainer'),
                     userSettings: currentSettings,
-                    enableSaveButton: false,
+                    enableSaveButton: true,
-                    enableSaveConfirmation: false,
+                    enableSaveConfirmation: true,
                     autoFocus: autoFocuser.isEnabled()
                 });
             }
@@ -48,5 +55,6 @@ define(['homescreenSettings', 'dom', 'globalize', 'loading', 'userSettings', 'au
                 homescreenSettingsInstance = null;
             }
         });
-    };
+    }
-});
+
+/* eslint-enable indent */

src/controllers/user/playback.js

@@ -1,10 +1,17 @@
-define(['playbackSettings', 'dom', 'globalize', 'loading', 'userSettings', 'autoFocuser', 'listViewStyle'], function (PlaybackSettings, dom, globalize, loading, userSettings, autoFocuser) {
+import PlaybackSettings from 'playbackSettings';
-    'use strict';
+import dom from 'dom';
+import globalize from 'globalize';
+import loading from 'loading';
+import * as userSettings from 'userSettings';
+import autoFocuser from 'autoFocuser';
+import 'listViewStyle';
+
+/* eslint-disable indent */
 
     // Shortcuts
     const UserSettings = userSettings.UserSettings;
 
-    return function (view, params) {
+    export default function (view, params) {
         function onBeforeUnload(e) {
             if (hasChanges) {
                 e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
@@ -26,8 +33,8 @@ define(['playbackSettings', 'dom', 'globalize', 'loading', 'userSettings', 'auto
                     userId: userId,
                     element: view.querySelector('.settingsContainer'),
                     userSettings: currentSettings,
-                    enableSaveButton: false,
+                    enableSaveButton: true,
-                    enableSaveConfirmation: false,
+                    enableSaveConfirmation: true,
                     autoFocus: autoFocuser.isEnabled()
                 });
             }
@@ -48,5 +55,6 @@ define(['playbackSettings', 'dom', 'globalize', 'loading', 'userSettings', 'auto
                 settingsInstance = null;
             }
         });
-    };
+    }
-});
+
+/* eslint-enable indent */

src/controllers/user/subtitles.js

@@ -1,10 +1,13 @@
-define(['subtitleSettings', 'userSettings', 'autoFocuser'], function (SubtitleSettings, userSettings, autoFocuser) {
+import SubtitleSettings from 'subtitleSettings';
-    'use strict';
+import * as userSettings from 'userSettings';
+import autoFocuser from 'autoFocuser';
+
+/* eslint-disable indent */
 
     // Shortcuts
     const UserSettings = userSettings.UserSettings;
 
-    return function (view, params) {
+    export default function (view, params) {
         function onBeforeUnload(e) {
             if (hasChanges) {
                 e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
@@ -26,8 +29,8 @@ define(['subtitleSettings', 'userSettings', 'autoFocuser'], function (SubtitleSe
                     userId: userId,
                     element: view.querySelector('.settingsContainer'),
                     userSettings: currentSettings,
-                    enableSaveButton: false,
+                    enableSaveButton: true,
-                    enableSaveConfirmation: false,
+                    enableSaveConfirmation: true,
                     autoFocus: autoFocuser.isEnabled()
                 });
             }
@@ -48,5 +51,6 @@ define(['subtitleSettings', 'userSettings', 'autoFocuser'], function (SubtitleSe
                 subtitleSettingsInstance = null;
             }
         });
-    };
+    }
-});
+
+/* eslint-enable indent */