diff --git a/src/components/keyboardnavigation.js b/src/components/keyboardnavigation.js index bc95e1cd3c..7ed74f2201 100644 --- a/src/components/keyboardnavigation.js +++ b/src/components/keyboardnavigation.js @@ -1,4 +1,4 @@ -define(['inputmanager', 'focusManager'], function(inputmanager, focusManager) { +define(['inputManager', 'focusManager'], function(inputManager, focusManager) { 'use strict'; console.log("keyboardnavigation"); @@ -9,16 +9,16 @@ define(['inputmanager', 'focusManager'], function(inputmanager, focusManager) { switch (e.keyCode) { case 37: // ArrowLeft - inputmanager.handle('left'); + inputManager.handle('left'); break; case 38: // ArrowUp - inputmanager.handle('up'); + inputManager.handle('up'); break; case 39: // ArrowRight - inputmanager.handle('right'); + inputManager.handle('right'); break; case 40: // ArrowDown - inputmanager.handle('down'); + inputManager.handle('down'); break; default: capture = false; diff --git a/src/components/serverNotifications/mouseManager.js b/src/components/serverNotifications/mouseManager.js index 16a9050530..ffea3b01ff 100644 --- a/src/components/serverNotifications/mouseManager.js +++ b/src/components/serverNotifications/mouseManager.js @@ -1,4 +1,4 @@ -define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'dom'], function (inputmanager, focusManager, browser, layoutManager, events, dom) { +define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'dom'], function (inputManager, focusManager, browser, layoutManager, events, dom) { 'use strict'; var self = {}; @@ -12,7 +12,7 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd function notifyApp() { - inputmanager.notifyMouseMove(); + inputManager.notifyMouseMove(); } function removeIdleClasses() { diff --git a/src/components/slideshow/slideshow.js b/src/components/slideshow/slideshow.js index 42cdabfffd..08fe6c5983 100644 --- a/src/components/slideshow/slideshow.js +++ b/src/components/slideshow/slideshow.js @@ -1,4 +1,4 @@ -define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'focusManager', 'browser', 'apphost', 'loading', 'css!./style', 'material-icons', 'paper-icon-button-light'], function (dialogHelper, inputmanager, connectionManager, layoutManager, focusManager, browser, appHost, loading) { +define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'focusManager', 'browser', 'apphost', 'loading', 'css!./style', 'material-icons', 'paper-icon-button-light'], function (dialogHelper, inputManager, connectionManager, layoutManager, focusManager, browser, appHost, loading) { 'use strict'; function getImageUrl(item, options, apiClient) { @@ -189,7 +189,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f stopInterval(); }); - inputmanager.on(window, onInputCommand); + inputManager.on(window, onInputCommand); document.addEventListener((window.PointerEvent ? 'pointermove' : 'mousemove'), onPointerMove); dlg.addEventListener('close', onDialogClosed); @@ -372,7 +372,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f swiperInstance = null; } - inputmanager.off(window, onInputCommand); + inputManager.off(window, onInputCommand); document.removeEventListener((window.PointerEvent ? 'pointermove' : 'mousemove'), onPointerMove); } diff --git a/src/controllers/videoosd.js b/src/controllers/videoosd.js index 8a6d1ffdf7..b610886963 100644 --- a/src/controllers/videoosd.js +++ b/src/controllers/videoosd.js @@ -1,4 +1,4 @@ -define(["playbackManager", "dom", "inputmanager", "datetime", "itemHelper", "mediaInfo", "focusManager", "imageLoader", "scrollHelper", "events", "connectionManager", "browser", "globalize", "apphost", "layoutManager", "userSettings", "scrollStyles", "emby-slider", "paper-icon-button-light", "css!css/videoosd"], function (playbackManager, dom, inputManager, datetime, itemHelper, mediaInfo, focusManager, imageLoader, scrollHelper, events, connectionManager, browser, globalize, appHost, layoutManager, userSettings) { +define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "mediaInfo", "focusManager", "imageLoader", "scrollHelper", "events", "connectionManager", "browser", "globalize", "apphost", "layoutManager", "userSettings", "scrollStyles", "emby-slider", "paper-icon-button-light", "css!css/videoosd"], function (playbackManager, dom, inputManager, datetime, itemHelper, mediaInfo, focusManager, imageLoader, scrollHelper, events, connectionManager, browser, globalize, appHost, layoutManager, userSettings) { "use strict"; function seriesImageUrl(item, options) { @@ -925,7 +925,7 @@ define(["playbackManager", "dom", "inputmanager", "datetime", "itemHelper", "med if (player) { // show subtitle offset feature only if player and media support it - var showSubOffset = playbackManager.supportSubtitleOffset(player) && + var showSubOffset = playbackManager.supportSubtitleOffset(player) && playbackManager.canHandleOffsetOnCurrentSubtitle(player); playerSettingsMenu.show({ @@ -1047,7 +1047,7 @@ define(["playbackManager", "dom", "inputmanager", "datetime", "itemHelper", "med playbackManager.setSubtitleStreamIndex(index, player); } - toggleSubtitleSync(); + toggleSubtitleSync(); }); }); } diff --git a/src/scripts/site.js b/src/scripts/site.js index a477a92329..b5fa85ac6c 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -855,7 +855,6 @@ var AppInfo = {}; define("htmlMediaHelper", [componentsPath + "/htmlMediaHelper"], returnFirstDependency); define("viewContainer", [componentsPath + "/viewContainer"], returnFirstDependency); define("dialogHelper", [componentsPath + "/dialogHelper/dialogHelper"], returnFirstDependency); - define("inputmanager", ["inputManager"], returnFirstDependency); define("serverNotifications", [componentsPath + "/serverNotifications/serverNotifications"], returnFirstDependency); define("skinManager", [componentsPath + "/skinManager"], returnFirstDependency); define("keyboardnavigation", [componentsPath + "/keyboardnavigation"], returnFirstDependency);