Merge pull request #1738 from Xantios/master

Move focusManager to ES6

package.json

@@ -110,6 +110,7 @@
           "src/components/favoriteitems.js",
           "src/components/fetchhelper.js",
           "src/components/filterdialog/filterdialog.js",
+          "src/components/focusManager.js",
           "src/components/groupedcards.js",
           "src/components/homeScreenSettings/homeScreenSettings.js",
           "src/components/homesections/homesections.js",

src/components/filtermenu/filtermenu.js

@@ -1,5 +1,6 @@
 define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost', 'inputManager', 'layoutManager', 'connectionManager', 'appRouter', 'globalize', 'userSettings', 'emby-checkbox', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button', 'flexStyles'], function (require, dom, focusManager, dialogHelper, loading, appHost, inputManager, layoutManager, connectionManager, appRouter, globalize, userSettings) {
     'use strict';
+    focusManager = focusManager.default || focusManager;
 
     function onSubmit(e) {
         e.preventDefault();

src/components/focusManager.js

@@ -1,5 +1,7 @@
-define(['dom', 'scrollManager'], function (dom, scrollManager) {
-    'use strict';
+/* eslint-disable indent */
+
+import dom from 'dom';
+import scrollManager from 'scrollManager';
 
     var scopes = [];
     function pushScope(elem) {
@@ -472,7 +474,9 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
         }
     }
 
-    return {
+/* eslint-enable indent */
+
+export default {
     autoFocus: autoFocus,
     focus: focus,
     focusableParent: focusableParent,
@@ -504,5 +508,4 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
     focusFirst: focusFirst,
     focusLast: focusLast,
     moveFocus: moveFocus
-    };
-});
+};

src/components/guide/guide.js

@@ -4,6 +4,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     playbackManager = playbackManager.default || playbackManager;
     browser = browser.default || browser;
     loading = loading.default || loading;
+    focusManager = focusManager.default || focusManager;
 
     function showViewSettings(instance) {
         require(['guide-settings-dialog'], function (guideSettingsDialog) {

src/components/slideshow/slideshow.js

@@ -6,6 +6,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
     'use strict';
 
     browser = browser.default || browser;
+    focusManager = focusManager.default || focusManager;
 
     /**
      * Name of transition event.

src/components/sortmenu/sortmenu.js

@@ -1,6 +1,8 @@
 define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutManager', 'connectionManager', 'globalize', 'userSettings', 'emby-select', 'paper-icon-button-light', 'material-icons', 'css!./../formdialog', 'emby-button', 'flexStyles'], function (require, dom, focusManager, dialogHelper, loading, layoutManager, connectionManager, globalize, userSettings) {
     'use strict';
 
+    focusManager = focusManager.default || focusManager;
+
     function onSubmit(e) {
         e.preventDefault();
         return false;

src/components/subtitleeditor/subtitleeditor.js

@@ -2,6 +2,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
     'use strict';
 
     loading = loading.default || loading;
+    focusManager = focusManager.default || focusManager;
 
     var currentItem;
     var hasChanges;

src/components/tunerPicker.js

@@ -3,6 +3,7 @@ define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize'
 
     browser = browser.default || browser;
     loading = loading.default || loading;
+    focusManager = focusManager.default || focusManager;
 
     var enableFocusTransform = !browser.slow && !browser.edge;
 

src/components/viewManager/viewManager.js

@@ -1,6 +1,8 @@
 define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], function (viewContainer, focusManager, queryString, layoutManager) {
     'use strict';
 
+    focusManager = focusManager.default || focusManager;
+
     var currentView;
     var dispatchPageEvents;
 

src/controllers/list.js

@@ -3,6 +3,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
 
     playbackManager = playbackManager.default || playbackManager;
     loading = loading.default || loading;
+    focusManager = focusManager.default || focusManager;
 
     function getInitialLiveTvQuery(instance, params) {
         var query = {

src/libraries/scroller.js

@@ -2,6 +2,7 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc
     'use strict';
 
     browser = browser.default || browser;
+    focusManager = focusManager.default || focusManager;
 
     /**
 * Return type of the value.

src/scripts/scrollHelper.js

@@ -1,6 +1,8 @@
 define(['focusManager', 'dom', 'scrollStyles'], function (focusManager, dom) {
     'use strict';
 
+    focusManager = focusManager.default || focusManager;
+
     function getBoundingClientRect(elem) {
         // Support: BlackBerry 5, iOS 3 (original iPhone)
         // If we don't have gBCR, just use 0,0 rather than error

src/scripts/serverNotifications.js

@@ -2,6 +2,7 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
     'use strict';
 
     playbackManager = playbackManager.default || playbackManager;
+    focusManager = focusManager.default || focusManager;
 
     var serverNotifications = {};