+ added settingshelper to site defines

~ convert subtitles controller to es6 module
+ added support for class controller

Signed-off-by: Christoph Potas <christoph286@googlemail.com>

src/components/subtitlesettings/subtitlesettings.js

@@ -6,7 +6,7 @@ import focusManager from 'focusManager';
 import loading from 'loading';
 import connectionManager from 'connectionManager';
 import subtitleAppearanceHelper from 'subtitleAppearanceHelper';
-import settingsHelper from '../settingshelper';
+import settingsHelper from 'settingsHelper';
 import dom from 'dom';
 import events from 'events';
 import 'listViewStyle';

src/components/viewManager/viewManager.js

@@ -25,6 +25,10 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi
 
                 // Use controller method
                 var controller = new options.controllerFactory(newView, eventDetail.detail.params);
+            } else if (typeof options.controllerFactory === 'object') {
+
+                // Use controller class
+                var controller = new options.controllerFactory.default(newView, eventDetail.detail.params);
             }
 
             if (!options.controllerFactory || dispatchPageEvents) {

src/controllers/user/subtitles.js

@@ -1,49 +1,63 @@
-define(["subtitleSettings", "userSettings", "autoFocuser"], function (SubtitleSettings, userSettings, autoFocuser) {
+import subtitleSettings from 'subtitleSettings';
-    "use strict";
+import * as userSettings from 'userSettings';
+import autoFocuser from 'autoFocuser';
 
-    return function (view, params) {
+export class SubtitleController {
-        function onBeforeUnload(e) {
+    constructor(view, params) {
-            if (hasChanges) {
+        this.userId = params.userId || ApiClient.getCurrentUserId();
-                e.returnValue = "You currently have unsaved changes. Are you sure you wish to leave?";
+        this.currentSettings = this.userId === ApiClient.getCurrentUserId() ? userSettings : new userSettings();
-            }
+        this.hasChanges = false;
+        this.subtitleSettingsInstance = null;
+        this.view = view;
+
+        view.addEventListener("viewshow", this.viewShow.bind(this));
+        view.addEventListener("change", this.change.bind(this));
+        view.addEventListener("viewbeforehide", this.viewBeforeHide.bind(this));
+        view.addEventListener("viewdestroy", this.viewDestroy.bind(this));
     }
 
-        var subtitleSettingsInstance;
+    viewShow() {
-        var hasChanges;
+        window.addEventListener("beforeunload", this.beforeUnload.bind(this));
-        var userId = params.userId || ApiClient.getCurrentUserId();
-        var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new userSettings();
-        view.addEventListener("viewshow", function () {
-            window.addEventListener("beforeunload", onBeforeUnload);
 
-            if (subtitleSettingsInstance) {
+        if (this.subtitleSettingsInstance) {
-                subtitleSettingsInstance.loadData();
+            this.subtitleSettingsInstance.loadData();
         } else {
-                subtitleSettingsInstance = new SubtitleSettings.default({
+            this.subtitleSettingsInstance = new subtitleSettings({
                 serverId: ApiClient.serverId(),
-                    userId: userId,
+                userId: this.userId,
-                    element: view.querySelector(".settingsContainer"),
+                element: this.view.querySelector(".settingsContainer"),
-                    userSettings: currentSettings,
+                userSettings: this.currentSettings,
                 enableSaveButton: false,
                 enableSaveConfirmation: false,
                 autoFocus: autoFocuser.isEnabled()
             });
         }
-        });
+    }
-        view.addEventListener("change", function () {
-            hasChanges = true;
-        });
-        view.addEventListener("viewbeforehide", function () {
-            hasChanges = false;
 
-            if (subtitleSettingsInstance) {
+    viewDestroy() {
-                subtitleSettingsInstance.submit();
+        if (this.subtitleSettingsInstance) {
+            this.subtitleSettingsInstance.destroy();
+            this.subtitleSettingsInstance = null;
         }
-        });
-        view.addEventListener("viewdestroy", function () {
-            if (subtitleSettingsInstance) {
-                subtitleSettingsInstance.destroy();
-                subtitleSettingsInstance = null;
     }
-        });
+
-    };
+    viewBeforeHide() {
-});
+        this.hasChanges = false;
+
+        if (this.subtitleSettingsInstance) {
+            this.subtitleSettingsInstance.submit();
+        }
+    }
+
+    change() {
+        this.hasChanges = true;
+    }
+
+    beforeUnload(e) {
+        if (this.hasChanges) {
+            e.returnValue = "You currently have unsaved changes. Are you sure you wish to leave?";
+        }
+    }
+}
+
+export default SubtitleController;

src/scripts/site.js

@@ -831,6 +831,7 @@ var AppInfo = {};
         define("upNextDialog", [componentsPath + "/upnextdialog/upnextdialog"], returnFirstDependency);
         define("subtitleAppearanceHelper", [componentsPath + "/subtitlesettings/subtitleappearancehelper"], returnFirstDependency);
         define("subtitleSettings", [componentsPath + "/subtitlesettings/subtitlesettings"], returnFirstDependency);
+        define("settingsHelper", [componentsPath + "/settingshelper"], returnFirstDependency);
         define("displaySettings", [componentsPath + "/displaysettings/displaysettings"], returnFirstDependency);
         define("playbackSettings", [componentsPath + "/playbacksettings/playbacksettings"], returnFirstDependency);
         define("homescreenSettings", [componentsPath + "/homescreensettings/homescreensettings"], returnFirstDependency);