Merge pull request #1707 from Camc314/migrate-to-ES6-48

Migration of playbackmanager to ES6 module

package.json

@@ -140,6 +140,7 @@
           "src/components/playback/mediasession.js",
           "src/components/playback/nowplayinghelper.js",
           "src/components/playback/playbackorientation.js",
+          "src/components/playback/playbackmanager.js",
           "src/components/playback/playerSelectionMenu.js",
           "src/components/playback/playersettingsmenu.js",
           "src/components/playback/playmethodhelper.js",

src/components/guide/guide.js

@@ -1,6 +1,7 @@
 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';
 
+    playbackManager = playbackManager.default || playbackManager;
     browser = browser.default || browser;
     loading = loading.default || loading;
 

src/components/itemsrefresher.js

@@ -1,6 +1,8 @@
 define(['playbackManager', 'serverNotifications', 'events'], function (playbackManager, serverNotifications, events) {
     'use strict';
 
+    playbackManager = playbackManager.default || playbackManager;
+
     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';
 
+    playbackManager = playbackManager.default || playbackManager;
+
     function onOneDocumentClick() {
         document.removeEventListener('click', onOneDocumentClick);
         document.removeEventListener('keydown', onOneDocumentClick);

src/components/recordingcreator/recordingcreator.js

@@ -104,7 +104,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
                 var apiClient = connectionManager.getApiClient(serverId);
 
                 apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId()).then(function (item) {
-                    playbackManager.play({
+                    playbackManager.default.play({
                         ids: [item.ChannelId],
                         serverId: serverId
                     });

src/components/remotecontrol/remotecontrol.js

@@ -1,5 +1,8 @@
 define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageLoader', 'playbackManager', 'nowPlayingHelper', 'events', 'connectionManager', 'apphost', 'globalize', 'layoutManager', 'userSettings', 'cardBuilder', 'itemContextMenu', 'cardStyle', 'emby-itemscontainer', 'css!./remotecontrol.css', 'emby-ratingbutton'], function (browser, datetime, backdrop, libraryBrowser, listView, imageLoader, playbackManager, nowPlayingHelper, events, connectionManager, appHost, globalize, layoutManager, userSettings, cardBuilder, itemContextMenu) {
     'use strict';
+
+    playbackManager = playbackManager.default || playbackManager;
+
     var showMuteButton = true;
     var showVolumeSlider = true;
 

src/components/subtitlesync/subtitlesync.js

@@ -1,6 +1,8 @@
 define(['playbackManager', 'layoutManager', 'text!./subtitlesync.template.html', 'css!./subtitlesync'], function (playbackManager, layoutManager, template, css) {
     'use strict';
 
+    playbackManager = playbackManager.default || playbackManager;
+
     var player;
     var subtitleSyncSlider;
     var subtitleSyncTextField;

src/components/themeMediaPlayer.js

@@ -1,6 +1,8 @@
 define(['playbackManager', 'userSettings', 'connectionManager'], function (playbackManager, userSettings, connectionManager) {
     'use strict';
 
+    playbackManager = playbackManager.default || playbackManager;
+
     var currentOwnerId;
     var currentThemeIds = [];
 

src/components/upnextdialog/upnextdialog.js

@@ -1,6 +1,8 @@
 define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'layoutManager', 'focusManager', 'globalize', 'itemHelper', 'css!./upnextdialog', 'emby-button', 'flexStyles'], function (dom, playbackManager, connectionManager, events, mediaInfo, layoutManager, focusManager, globalize, itemHelper) {
     'use strict';
 
+    playbackManager = playbackManager.default || playbackManager;
+
     var transitionEndEventName = dom.whichTransitionEvent();
 
     function seriesImageUrl(item, options) {

src/controllers/list.js

@@ -1,6 +1,7 @@
 define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager', 'cardBuilder', 'loading', 'connectionManager', 'alphaNumericShortcuts', 'scroller', 'playbackManager', 'alphaPicker', 'emby-itemscontainer', 'emby-scroller'], function (globalize, listView, layoutManager, userSettings, focusManager, cardBuilder, loading, connectionManager, AlphaNumericShortcuts, scroller, playbackManager, AlphaPicker) {
     'use strict';
 
+    playbackManager = playbackManager.default || playbackManager;
     loading = loading.default || loading;
 
     function getInitialLiveTvQuery(instance, params) {

src/controllers/movies/moviesrecommended.js

@@ -1,6 +1,8 @@
 define(['events', 'layoutManager', 'inputManager', 'userSettings', 'libraryMenu', 'mainTabsManager', 'cardBuilder', 'dom', 'imageLoader', 'playbackManager', 'globalize', 'emby-scroller', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (events, layoutManager, inputManager, userSettings, libraryMenu, mainTabsManager, cardBuilder, dom, imageLoader, playbackManager, globalize) {
     'use strict';
 
+    playbackManager = playbackManager.default || playbackManager;
+
     function enableScrollX() {
         return !layoutManager.desktop;
     }

src/libraries/screensavermanager.js

@@ -1,6 +1,8 @@
 define(["events", "playbackManager", "pluginManager", "inputManager", "connectionManager", "userSettings"], function (events, playbackManager, pluginManager, inputManager, connectionManager, userSettings) {
     "use strict";
 
+    playbackManager = playbackManager.default || playbackManager;
+
     function getMinIdleTime() {
         // Returns the minimum amount of idle time required before the screen saver can be displayed
         //time units used Millisecond

src/plugins/chromecastPlayer/plugin.js

@@ -1,6 +1,8 @@
 define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', 'globalize', 'events', 'require', 'castSenderApiLoader'], function (appSettings, userSettings, playbackManager, connectionManager, globalize, events, require, castSenderApiLoader) {
     'use strict';
 
+    playbackManager = playbackManager.default || playbackManager;
+
     // Based on https://github.com/googlecast/CastVideos-chrome/blob/master/CastVideos.js
     var currentResolve;
     var currentReject;

src/plugins/sessionPlayer/plugin.js

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

src/scripts/libraryMenu.js

@@ -1,6 +1,7 @@
 define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', 'viewManager', 'libraryBrowser', 'appRouter', 'apphost', 'playbackManager', 'syncPlayManager', 'groupSelectionMenu', 'browser', 'globalize', 'scripts/imagehelper', 'paper-icon-button-light', 'material-icons', 'scrollStyles', 'flexStyles'], function (dom, layoutManager, inputManager, connectionManager, events, viewManager, libraryBrowser, appRouter, appHost, playbackManager, syncPlayManager, groupSelectionMenu, browser, globalize, imageHelper) {
     'use strict';
 
+    playbackManager = playbackManager.default || playbackManager;
     browser = browser.default || browser;
 
     function renderHeader() {

src/scripts/serverNotifications.js

@@ -1,6 +1,8 @@
 define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'inputManager', 'focusManager', 'appRouter'], function (connectionManager, playbackManager, syncPlayManager, events, inputManager, focusManager, appRouter) {
     'use strict';
 
+    playbackManager = playbackManager.default || playbackManager;
+
     var serverNotifications = {};
 
     function notifyApp() {