move some elements to a new directory

src/components/serverNotifications/serverNotifications.js

@@ -4,20 +4,15 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
     var serverNotifications = {};
 
     function notifyApp() {
-
         inputManager.notify();
     }
 
     function displayMessage(cmd) {
-
         var args = cmd.Arguments;
-
         if (args.TimeoutMs) {
-
             require(['toast'], function (toast) {
                 toast({ title: args.Header, text: args.Text });
             });
-
         } else {
             require(['alert'], function (alert) {
                 alert({ title: args.Header, text: args.Text });
@@ -146,14 +141,10 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
     }
 
     function onMessageReceived(e, msg) {
-
         var apiClient = this;
-
         if (msg.MessageType === "Play") {
-
             notifyApp();
             var serverId = apiClient.serverInfo().Id;
-
             if (msg.Data.PlayCommand === "PlayNext") {
                 playbackManager.queueNext({ ids: msg.Data.ItemIds, serverId: serverId });
             } else if (msg.Data.PlayCommand === "PlayLast") {
@@ -169,9 +160,7 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
                     serverId: serverId
                 });
             }
-
         } else if (msg.MessageType === "Playstate") {
-
             if (msg.Data.Command === 'Stop') {
                 inputManager.trigger('stop');
             } else if (msg.Data.Command === 'Pause') {
@@ -193,22 +182,17 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
             var cmd = msg.Data;
             processGeneralCommand(cmd, apiClient);
         } else if (msg.MessageType === "UserDataChanged") {
-
             if (msg.Data.UserId === apiClient.getCurrentUserId()) {
-
                 for (var i = 0, length = msg.Data.UserDataList.length; i < length; i++) {
                     events.trigger(serverNotifications, 'UserDataChanged', [apiClient, msg.Data.UserDataList[i]]);
                 }
             }
         } else {
-
             events.trigger(serverNotifications, msg.MessageType, [apiClient, msg.Data]);
         }
-
     }
 
     function bindEvents(apiClient) {
-
         events.off(apiClient, "message", onMessageReceived);
         events.on(apiClient, "message", onMessageReceived);
     }
@@ -229,7 +213,6 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
     connectionManager.getApiClients().forEach(bindEvents);
 
     events.on(connectionManager, 'apiclientcreated', function (e, newApiClient) {
-
         bindEvents(newApiClient);
     });
 

src/scripts/site.js

@@ -753,11 +753,26 @@ var AppInfo = {};
         // TODO remove these libraries
         // all three have been modified so we need to fix that first
         define("page", [bowerPath + "/pagejs/page"], returnFirstDependency);
+        define("headroom", [componentsPath + "/headroom/headroom"], returnFirstDependency);
         define("scroller", [componentsPath + "/scroller"], returnFirstDependency);
+        define("navdrawer", [componentsPath + "/navdrawer/navdrawer"], returnFirstDependency);
         define("queryString", [bowerPath + "/query-string/index"], function () {
             return queryString;
         });
 
+        var elementsPath = "elements"
+        define("emby-button", [elementsPath + "/emby-button/emby-button"], returnFirstDependency);
+        define("paper-icon-button-light", [elementsPath + "/emby-button/paper-icon-button-light"], returnFirstDependency);
+        define("emby-checkbox", [elementsPath + "/emby-checkbox/emby-checkbox"], returnFirstDependency);
+        define("emby-collapse", [elementsPath + "/emby-collapse/emby-collapse"], returnFirstDependency);
+        define("emby-input", [elementsPath + "/emby-input/emby-input"], returnFirstDependency);
+        define("emby-progressring", [elementsPath + "/emby-progressring/emby-progressring"], returnFirstDependency);
+        define("emby-radio", [elementsPath + "/emby-radio/emby-radio"], returnFirstDependency);
+        define("emby-select", [elementsPath + "/emby-select/emby-select"], returnFirstDependency);
+        define("emby-slider", [elementsPath + "/emby-slider/emby-slider"], returnFirstDependency);
+        define("emby-textarea", [elementsPath + "/emby-textarea/emby-textarea"], returnFirstDependency);
+        define("emby-toggle", [elementsPath + "/emby-toggle/emby-toggle"], returnFirstDependency);
+
         define("chromecastHelper", [componentsPath + "/chromecast/chromecasthelpers"], returnFirstDependency);
         define("mediaSession", [componentsPath + "/playback/mediasession"], returnFirstDependency);
         define("actionsheet", [componentsPath + "/actionsheet/actionsheet"], returnFirstDependency);
@@ -771,27 +786,16 @@ var AppInfo = {};
         define("playerSettingsMenu", [componentsPath + "/playback/playersettingsmenu"], returnFirstDependency);
         define("playMethodHelper", [componentsPath + "/playback/playmethodhelper"], returnFirstDependency);
         define("brightnessOsd", [componentsPath + "/playback/brightnessosd"], returnFirstDependency);
-        define("emby-collapse", [componentsPath + "/emby-collapse/emby-collapse"], returnFirstDependency);
-        define("emby-button", [componentsPath + "/emby-button/emby-button"], returnFirstDependency);
         define("emby-itemscontainer", [componentsPath + "/emby-itemscontainer/emby-itemscontainer"], returnFirstDependency);
         define("alphaNumericShortcuts", [componentsPath + "/alphanumericshortcuts/alphanumericshortcuts"], returnFirstDependency);
         define("emby-scroller", [componentsPath + "/emby-scroller/emby-scroller"], returnFirstDependency);
         define("emby-tabs", [componentsPath + "/emby-tabs/emby-tabs"], returnFirstDependency);
         define("emby-scrollbuttons", [componentsPath + "/emby-scrollbuttons/emby-scrollbuttons"], returnFirstDependency);
-        define("emby-progressring", [componentsPath + "/emby-progressring/emby-progressring"], returnFirstDependency);
         define("emby-itemrefreshindicator", [componentsPath + "/emby-itemrefreshindicator/emby-itemrefreshindicator"], returnFirstDependency);
         define("multiSelect", [componentsPath + "/multiselect/multiselect"], returnFirstDependency);
         define("alphaPicker", [componentsPath + "/alphapicker/alphapicker"], returnFirstDependency);
-        define("paper-icon-button-light", [componentsPath + "/emby-button/paper-icon-button-light"], returnFirstDependency);
         define("tabbedView", [componentsPath + "/tabbedview/tabbedview"], returnFirstDependency);
         define("itemsTab", [componentsPath + "/tabbedview/itemstab"], returnFirstDependency);
-        define("emby-input", [componentsPath + "/emby-input/emby-input"], returnFirstDependency);
-        define("emby-select", [componentsPath + "/emby-select/emby-select"], returnFirstDependency);
-        define("emby-slider", [componentsPath + "/emby-slider/emby-slider"], returnFirstDependency);
-        define("emby-checkbox", [componentsPath + "/emby-checkbox/emby-checkbox"], returnFirstDependency);
-        define("emby-toggle", [componentsPath + "/emby-toggle/emby-toggle"], returnFirstDependency);
-        define("emby-radio", [componentsPath + "/emby-radio/emby-radio"], returnFirstDependency);
-        define("emby-textarea", [componentsPath + "/emby-textarea/emby-textarea"], returnFirstDependency);
         define("collectionEditor", [componentsPath + "/collectioneditor/collectioneditor"], returnFirstDependency);
         define("serverRestartDialog", [componentsPath + "/serverRestartDialog"], returnFirstDependency);
         define("playlistEditor", [componentsPath + "/playlisteditor/playlisteditor"], returnFirstDependency);
@@ -816,7 +820,6 @@ var AppInfo = {};
         define("upNextDialog", [componentsPath + "/upnextdialog/upnextdialog"], returnFirstDependency);
         define("fullscreen-doubleclick", [componentsPath + "/fullscreen/fullscreen-dc"], returnFirstDependency);
         define("fullscreenManager", [componentsPath + "/fullscreenManager", "events"], returnFirstDependency);
-        define("headroom", [componentsPath + "/headroom/headroom"], returnFirstDependency);
         define("subtitleAppearanceHelper", [componentsPath + "/subtitlesettings/subtitleappearancehelper"], returnFirstDependency);
         define("subtitleSettings", [componentsPath + "/subtitlesettings/subtitlesettings"], returnFirstDependency);
         define("displaySettings", [componentsPath + "/displaysettings/displaysettings"], returnFirstDependency);
@@ -861,7 +864,6 @@ var AppInfo = {};
         define("userSettings", [componentsPath + "/usersettings/usersettings"], returnFirstDependency);
         define("userSettingsBuilder", [componentsPath + "/usersettings/usersettingsbuilder", "layoutManager", "browser"], returnFirstDependency);
         define("imageUploader", [componentsPath + "/imageuploader/imageuploader"], returnFirstDependency);
-        define("navdrawer", [componentsPath + "/navdrawer/navdrawer"], returnFirstDependency);
         define("htmlMediaHelper", [componentsPath + "/htmlMediaHelper"], returnFirstDependency);
         define("viewContainer", [componentsPath + "/viewContainer"], returnFirstDependency);
         define("dialogHelper", [componentsPath + "/dialogHelper/dialogHelper"], returnFirstDependency);