Migrate shell, serverNotifications to ES6 + remove searchtab

package.json

@@ -250,9 +250,11 @@
           "src/scripts/inputManager.js",
           "src/scripts/keyboardNavigation.js",
           "src/scripts/playlists.js",
+          "src/scripts/serverNotifications.js",
           "src/scripts/settings/appSettings.js",
           "src/scripts/settings/userSettings.js",
           "src/scripts/settings/webSettings.js",
+          "src/scripts/shell.js",
           "src/scripts/taskbutton.js",
           "src/scripts/themeLoader.js",
           "src/scripts/touchHelper.js"

src/assets/css/librarybrowser.css

@@ -236,12 +236,6 @@
     text-align: center;
 }
 
-.layout-desktop .searchTabButton,
-.layout-mobile .searchTabButton,
-.layout-tv .headerSearchButton {
-    display: none !important;
-}
-
 .mainDrawer-scrollContainer {
     padding-bottom: 10vh;
 }

src/components/guide/guide.js

@@ -1,6 +1,8 @@
 define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', 'scrollHelper', 'serverNotifications', 'loading', 'datetime', 'focusManager', 'playbackManager', 'userSettings', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'dom', 'css!./guide.css', 'programStyles', 'material-icons', 'scrollStyles', 'emby-programcell', 'emby-button', 'paper-icon-button-light', 'emby-tabs', 'emby-scroller', 'flexStyles', 'webcomponents'], function (require, inputManager, browser, globalize, connectionManager, scrollHelper, serverNotifications, loading, datetime, focusManager, playbackManager, userSettings, imageLoader, events, layoutManager, itemShortcuts, dom) {
     'use strict';
 
+    serverNotifications = serverNotifications.default || serverNotifications;
+
     function showViewSettings(instance) {
 
         require(['guide-settings-dialog'], function (guideSettingsDialog) {

src/components/itemsrefresher.js

@@ -1,6 +1,8 @@
 define(['playbackManager', 'serverNotifications', 'events'], function (playbackManager, serverNotifications, events) {
     'use strict';
 
+    serverNotifications = serverNotifications.default || serverNotifications;
+
     function onUserDataChanged(e, apiClient, userData) {
 
         var instance = this;

src/components/notifications/notifications.js

@@ -1,6 +1,8 @@
 define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'require'], function (serverNotifications, playbackManager, events, globalize, require) {
     'use strict';
 
+    serverNotifications = serverNotifications.default || serverNotifications;
+
     function onOneDocumentClick() {
         document.removeEventListener('click', onOneDocumentClick);
         document.removeEventListener('keydown', onOneDocumentClick);

src/components/playback/playbackmanager.js

@@ -3455,6 +3455,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         if (apphost.supports('remotecontrol')) {
 
             require(['serverNotifications'], function (serverNotifications) {
+                serverNotifications = serverNotifications.default || serverNotifications;
                 events.on(serverNotifications, 'ServerShuttingDown', self.setDefaultPlayerActive.bind(self));
                 events.on(serverNotifications, 'ServerRestarting', self.setDefaultPlayerActive.bind(self));
             });

src/components/recordingcreator/recordingfields.js

@@ -1,6 +1,8 @@
 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';
 
+    serverNotifications = serverNotifications.default || serverNotifications;
+
     function loadData(parent, program, apiClient) {
         if (program.IsSeries) {
             parent.querySelector('.recordSeriesContainer').classList.remove('hide');

src/controllers/livetv/livetvsuggested.js

@@ -167,9 +167,6 @@ define(['layoutManager', 'userSettings', 'inputManager', 'loading', 'globalize',
             name: globalize.translate('HeaderSchedule')
         }, {
             name: globalize.translate('TabSeries')
-        }, {
-            name: globalize.translate('ButtonSearch'),
-            cssClass: 'searchTabButton'
         }];
     }
 
@@ -253,9 +250,6 @@ define(['layoutManager', 'userSettings', 'inputManager', 'loading', 'globalize',
                 case 5:
                     depends.push('controllers/livetv/livetvseriestimers');
                     break;
-
-                case 6:
-                    depends.push('scripts/searchtab');
             }
 
             require(depends, function (controllerFactory) {

src/controllers/movies/moviesrecommended.js

@@ -222,9 +222,6 @@ define(['events', 'layoutManager', 'inputManager', 'userSettings', 'libraryMenu'
             name: globalize.translate('TabCollections')
         }, {
             name: globalize.translate('TabGenres')
-        }, {
-            name: globalize.translate('ButtonSearch'),
-            cssClass: 'searchTabButton'
         }];
     }
 
@@ -291,9 +288,6 @@ define(['events', 'layoutManager', 'inputManager', 'userSettings', 'libraryMenu'
                 case 5:
                     depends.push('controllers/movies/moviegenres');
                     break;
-
-                case 6:
-                    depends.push('scripts/searchtab');
             }
 
             require(depends, function (controllerFactory) {

src/controllers/music/musicrecommended.js

@@ -180,9 +180,6 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
             name: globalize.translate('TabSongs')
         }, {
             name: globalize.translate('TabGenres')
-        }, {
-            name: globalize.translate('ButtonSearch'),
-            cssClass: 'searchTabButton'
         }];
     }
 
@@ -283,9 +280,6 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
                 case 6:
                     depends.push('controllers/music/musicgenres');
                     break;
-
-                case 7:
-                    depends.push('scripts/searchtab');
             }
 
             require(depends, function (controllerFactory) {

src/controllers/shows/tvrecommended.js

@@ -30,9 +30,6 @@ import 'emby-button';
             name: globalize.translate('TabNetworks')
         }, {
             name: globalize.translate('TabEpisodes')
-        }, {
-            name: globalize.translate('ButtonSearch'),
-            cssClass: 'searchTabButton'
         }];
     }
 
@@ -217,10 +214,6 @@ import 'emby-button';
                 case 6:
                     depends = 'controllers/shows/episodes';
                     break;
-
-                case 7:
-                    depends = 'scripts/searchtab';
-                    break;
             }
 
             import(depends).then(({default: controllerFactory}) => {

src/plugins/sessionPlayer/plugin.js

@@ -1,6 +1,8 @@
 define(['playbackManager', 'events', 'serverNotifications', 'connectionManager'], function (playbackManager, events, serverNotifications, connectionManager) {
     'use strict';
 
+    serverNotifications = serverNotifications.default || serverNotifications;
+
     function getActivePlayerId() {
         var info = playbackManager.getPlayerInfo();
         return info ? info.id : null;

src/scripts/searchtab.js

@@ -1,57 +0,0 @@
-define(['searchFields', 'searchResults', 'events'], function (SearchFields, SearchResults, events) {
-    'use strict';
-
-    SearchFields = SearchFields.default || SearchFields;
-    SearchResults = SearchResults.default || SearchResults;
-
-    function init(instance, tabContent, options) {
-        tabContent.innerHTML = '<div class="padded-left padded-right searchFields"></div><div class="searchResults padded-top" style="padding-top:1.5em;"></div>';
-        instance.searchFields = new SearchFields({
-            element: tabContent.querySelector('.searchFields')
-        });
-        instance.searchResults = new SearchResults({
-            element: tabContent.querySelector('.searchResults'),
-            serverId: ApiClient.serverId(),
-            parentId: options.parentId,
-            collectionType: options.collectionType
-        });
-        events.on(instance.searchFields, 'search', function (e, value) {
-            instance.searchResults.search(value);
-        });
-    }
-
-    function SearchTab(view, tabContent, options) {
-        var self = this;
-        options = options || {};
-        init(this, tabContent, options);
-
-        self.preRender = function () {};
-
-        self.renderTab = function () {
-            var searchFields = this.searchFields;
-
-            if (searchFields) {
-                searchFields.focus();
-            }
-        };
-    }
-
-    SearchTab.prototype.destroy = function () {
-        var searchFields = this.searchFields;
-
-        if (searchFields) {
-            searchFields.destroy();
-        }
-
-        this.searchFields = null;
-        var searchResults = this.searchResults;
-
-        if (searchResults) {
-            searchResults.destroy();
-        }
-
-        this.searchResults = null;
-    };
-
-    return SearchTab;
-});

src/scripts/serverNotifications.js

@@ -1,14 +1,19 @@
-define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'inputManager', 'focusManager', 'appRouter'], function (connectionManager, playbackManager, syncPlayManager, events, inputManager, focusManager, appRouter) {
+import connectionManager from 'connectionManager';
-    'use strict';
+import playbackManager from 'playbackManager';
+import syncPlayManager from 'syncPlayManager';
+import events from 'events';
+import inputManager from 'inputManager';
+import focusManager from 'focusManager';
+import appRouter from 'appRouter';
 
-    var serverNotifications = {};
+const serverNotifications = {};
 
-    function notifyApp() {
+function notifyApp() {
     inputManager.notify();
-    }
+}
 
-    function displayMessage(cmd) {
+function displayMessage(cmd) {
-        var args = cmd.Arguments;
+    const args = cmd.Arguments;
     if (args.TimeoutMs) {
         require(['toast'], function (toast) {
             toast({ title: args.Header, text: args.Text });
@@ -18,21 +23,21 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
             alert.default({ title: args.Header, text: args.Text });
         });
     }
-    }
+}
 
-    function displayContent(cmd, apiClient) {
+function displayContent(cmd, apiClient) {
     if (!playbackManager.isPlayingLocally(['Video', 'Book'])) {
         appRouter.showItem(cmd.Arguments.ItemId, apiClient.serverId());
     }
-    }
+}
 
-    function playTrailers(apiClient, itemId) {
+function playTrailers(apiClient, itemId) {
     apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
         playbackManager.playTrailers(item);
     });
-    }
+}
 
-    function processGeneralCommand(cmd, apiClient) {
+function processGeneralCommand(cmd, apiClient) {
     console.debug('Received command: ' + cmd.Name);
     switch (cmd.Name) {
         case 'Select':
@@ -141,13 +146,13 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
     }
 
     notifyApp();
-    }
+}
 
-    function onMessageReceived(e, msg) {
+function onMessageReceived(e, msg) {
-        var apiClient = this;
+    const apiClient = this;
     if (msg.MessageType === 'Play') {
         notifyApp();
-            var serverId = apiClient.serverInfo().Id;
+        const serverId = apiClient.serverInfo().Id;
         if (msg.Data.PlayCommand === 'PlayNext') {
             playbackManager.queueNext({ ids: msg.Data.ItemIds, serverId: serverId });
         } else if (msg.Data.PlayCommand === 'PlayLast') {
@@ -182,11 +187,11 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
             notifyApp();
         }
     } else if (msg.MessageType === 'GeneralCommand') {
-            var cmd = msg.Data;
+        const 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++) {
+            for (let i = 0, length = msg.Data.UserDataList.length; i < length; i++) {
                 events.trigger(serverNotifications, 'UserDataChanged', [apiClient, msg.Data.UserDataList[i]]);
             }
         }
@@ -197,15 +202,15 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
     } else {
         events.trigger(serverNotifications, msg.MessageType, [apiClient, msg.Data]);
     }
-    }
+}
-    function bindEvents(apiClient) {
+function bindEvents(apiClient) {
     events.off(apiClient, 'message', onMessageReceived);
     events.on(apiClient, 'message', onMessageReceived);
-    }
+}
 
-    connectionManager.getApiClients().forEach(bindEvents);
+connectionManager.getApiClients().forEach(bindEvents);
-    events.on(connectionManager, 'apiclientcreated', function (e, newApiClient) {
+events.on(connectionManager, 'apiclientcreated', function (e, newApiClient) {
     bindEvents(newApiClient);
-    });
-    return serverNotifications;
 });
+
+export default serverNotifications;

src/scripts/shell.js

@@ -1,7 +1,5 @@
-define([], function () {
+// TODO: This seems like a good candidate for deprecation
-    'use strict';
+export default {
-
-    return {
     openUrl: function (url, target) {
         if (window.NativeShell) {
             window.NativeShell.openUrl(url, target);
@@ -20,5 +18,4 @@ define([], function () {
             window.NativeShell.disableFullscreen();
         }
     }
-    };
+};
-});