Migration of user/menu and user/profile to ES6 modules

package.json

@@ -141,6 +141,8 @@
           "src/controllers/dashboard/dashboard.js",
           "src/controllers/dashboard/encodingsettings.js",
           "src/controllers/dashboard/logs.js",
+          "src/controllers/user/menu.js",
+          "src/controllers/user/profile.js",
           "src/controllers/user/subtitles.js",
           "src/controllers/dashboard/plugins/repositories.js",
           "src/elements/emby-checkbox/emby-checkbox.js",

src/controllers/user/menu.js

@@ -1,8 +1,11 @@
-define(['apphost', 'connectionManager', 'layoutManager', 'listViewStyle', 'emby-button'], function(appHost, connectionManager, layoutManager) {
+import appHost from 'apphost';
-    'use strict';
+import connectionManager from 'connectionManager';
+import layoutManager from 'layoutManager';
+import 'listViewStyle';
+import 'emby-button';
 
-    return function(view, params) {
+export default function (view, params) {
-        view.querySelector('.btnLogout').addEventListener('click', function() {
+    view.querySelector('.btnLogout').addEventListener('click', function () {
         Dashboard.logout();
     });
 
@@ -14,10 +17,10 @@ define(['apphost', 'connectionManager', 'layoutManager', 'listViewStyle', 'emby-
         window.NativeShell.openClientSettings();
     });
 
-        view.addEventListener('viewshow', function() {
+    view.addEventListener('viewshow', function () {
         // this page can also be used by admins to change user preferences from the user edit page
-            var userId = params.userId || Dashboard.getCurrentUserId();
+        const userId = params.userId || Dashboard.getCurrentUserId();
-            var page = this;
+        const page = this;
 
         page.querySelector('.lnkMyProfile').setAttribute('href', 'myprofile.html?userId=' + userId);
         page.querySelector('.lnkDisplayPreferences').setAttribute('href', 'mypreferencesdisplay.html?userId=' + userId);
@@ -43,16 +46,15 @@ define(['apphost', 'connectionManager', 'layoutManager', 'listViewStyle', 'emby-
             page.querySelector('.adminSection').classList.add('hide');
         }
 
-            ApiClient.getUser(userId).then(function(user) {
+        ApiClient.getUser(userId).then(function (user) {
             page.querySelector('.headerUsername').innerHTML = user.Name;
             if (!user.Policy.IsAdministrator) {
                 page.querySelector('.adminSection').classList.add('hide');
             }
         });
 
-            require(['autoFocuser'], function (autoFocuser) {
+        import('autoFocuser').then(({default: autoFocuser}) => {
             autoFocuser.autoFocus(view);
         });
     });
-    };
+}
-});

src/controllers/user/profile.js

@@ -1,14 +1,18 @@
-define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu', 'apphost', 'globalize', 'emby-button'], function (UserPasswordPage, loading, libraryMenu, appHost, globalize) {
+import UserPasswordPage from 'controllers/dashboard/users/userpasswordpage';
-    'use strict';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import appHost from 'apphost';
+import globalize from 'globalize';
+import 'emby-button';
 
-    function reloadUser(page) {
+function reloadUser(page) {
-        var userId = getParameterByName('userId');
+    const userId = getParameterByName('userId');
     loading.show();
     ApiClient.getUser(userId).then(function (user) {
         page.querySelector('.username').innerHTML = user.Name;
         libraryMenu.setTitle(user.Name);
 
-            var imageUrl = 'assets/img/avatar.png';
+        let imageUrl = 'assets/img/avatar.png';
         if (user.PrimaryImageTag) {
             imageUrl = ApiClient.getUserImageUrl(user.Id, {
                 tag: user.PrimaryImageTag,
@@ -16,7 +20,7 @@ define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu'
             });
         }
 
-            var userImage = page.querySelector('#image');
+        const userImage = page.querySelector('#image');
         userImage.style.backgroundImage = 'url(' + imageUrl + ')';
 
         Dashboard.getCurrentUser().then(function (loggedInUser) {
@@ -30,13 +34,13 @@ define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu'
         });
         loading.hide();
     });
-    }
+}
 
-    function onFileReaderError(evt) {
+function onFileReaderError(evt) {
     loading.hide();
     switch (evt.target.error.code) {
         case evt.target.error.NOT_FOUND_ERR:
-                require(['toast'], function (toast) {
+            import('toast').then(({default: toast}) => {
                 toast(globalize.translate('FileNotFound'));
             });
             break;
@@ -45,33 +49,33 @@ define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu'
             break;
         case evt.target.error.NOT_READABLE_ERR:
         default:
-                require(['toast'], function (toast) {
+            import('toast').then(({default: toast}) => {
                 toast(globalize.translate('FileReadError'));
             });
     }
-    }
+}
 
-    function onFileReaderAbort(evt) {
+function onFileReaderAbort(evt) {
     loading.hide();
-        require(['toast'], function (toast) {
+    import('toast').then(({default: toast}) => {
         toast(globalize.translate('FileReadCancelled'));
     });
-    }
+}
 
-    function setFiles(page, files) {
+function setFiles(page, files) {
-        var userImage = page.querySelector('#image');
+    const userImage = page.querySelector('#image');
-        var file = files[0];
+    const file = files[0];
 
     if (!file || !file.type.match('image.*')) {
         return false;
     }
 
-        var reader = new FileReader();
+    const reader = new FileReader();
     reader.onerror = onFileReaderError;
     reader.onabort = onFileReaderAbort;
     reader.onload = function (evt) {
         userImage.style.backgroundImage = 'url(' + evt.target.result + ')';
-            var userId = getParameterByName('userId');
+        const userId = getParameterByName('userId');
         ApiClient.uploadUserImage(userId, 'Primary', file).then(function () {
             loading.hide();
             reloadUser(page);
@@ -79,16 +83,16 @@ define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu'
     };
 
     reader.readAsDataURL(file);
-    }
+}
 
-    return function (view, params) {
+export default function (view, params) {
     reloadUser(view);
     new UserPasswordPage(view, params);
     view.querySelector('#btnDeleteImage').addEventListener('click', function () {
-            require(['confirm'], function (confirm) {
+        import('confirm').then(({default: confirm}) => {
             confirm(globalize.translate('DeleteImageConfirmation'), globalize.translate('DeleteImage')).then(function () {
                 loading.show();
-                    var userId = getParameterByName('userId');
+                const userId = getParameterByName('userId');
                 ApiClient.deleteUserImage(userId, 'primary').then(function () {
                     loading.hide();
                     reloadUser(view);
@@ -102,5 +106,4 @@ define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu'
     view.querySelector('#uploadImage').addEventListener('change', function (evt) {
         setFiles(view, evt.target.files);
     });
-    };
+}
-});