Merge pull request #1284 from Delgan/es6-modules-components-playback

Migrate components/playback functions to ES6 modules

package.json

@@ -95,8 +95,15 @@
           "src/components/images/imageLoader.js",
           "src/components/indicators/indicators.js",
           "src/components/lazyLoader/lazyLoaderIntersectionObserver.js",
+          "src/components/playback/brightnessosd.js",
           "src/components/playback/mediasession.js",
+          "src/components/playback/nowplayinghelper.js",
+          "src/components/playback/playbackorientation.js",
+          "src/components/playback/playerSelectionMenu.js",
+          "src/components/playback/playersettingsmenu.js",
+          "src/components/playback/playmethodhelper.js",
           "src/components/playback/remotecontrolautoplay.js",
+          "src/components/playback/volumeosd.js",
           "src/components/playmenu.js",
           "src/components/sanatizefilename.js",
           "src/components/scrollManager.js",

src/components/playback/brightnessosd.js

@@ -1,5 +1,9 @@
-define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'material-icons'], function (events, playbackManager, dom, browser) {
+import events from 'events';
-    'use strict';
+import playbackManager from 'playbackManager';
+import dom from 'dom';
+import browser from 'browser';
+import 'css!./iconosd';
+import 'material-icons';
 
 var currentPlayer;
 var osdElement;
@@ -99,9 +103,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
 }
 
 function setIcon(iconElement, icon) {
-        iconElement.classList.remove('brightness_high');
+    iconElement.classList.remove('brightness_high', 'brightness_medium', 'brightness_low');
-        iconElement.classList.remove('brightness_medium');
-        iconElement.classList.remove('brightness_low');
     iconElement.classList.add(icon);
 }
 
@@ -167,5 +169,3 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
 });
 
 bindToPlayer(playbackManager.getCurrentPlayer());
-
-});

src/components/playback/nowplayinghelper.js

@@ -1,7 +1,4 @@
-define([], function () {
+export function getNowPlayingNames(nowPlayingItem, includeNonNameInfo) {
-    'use strict';
-
-    function getNowPlayingNames(nowPlayingItem, includeNonNameInfo) {
 
     var topItem = nowPlayingItem;
     var bottomItem = null;
@@ -80,7 +77,6 @@ define([], function () {
     return list;
 }
 
-    return {
+export default {
     getNowPlayingNames: getNowPlayingNames
 };
-});

src/components/playback/playbackorientation.js

@@ -1,5 +1,6 @@
-define(['playbackManager', 'layoutManager', 'events'], function (playbackManager, layoutManager, events) {
+import playbackManager from 'playbackManager';
-    'use strict';
+import layoutManager from 'layoutManager';
+import events from 'events';
 
 var orientationLocked;
 
@@ -54,4 +55,3 @@ define(['playbackManager', 'layoutManager', 'events'], function (playbackManager
         }
     }
 });
-});

src/components/playback/playerSelectionMenu.js

@@ -1,5 +1,11 @@
-define(['appSettings', 'events', 'browser', 'loading', 'playbackManager', 'appRouter', 'globalize', 'apphost'], function (appSettings, events, browser, loading, playbackManager, appRouter, globalize, appHost) {
+import appSettings from 'appSettings';
-    'use strict';
+import events from 'events';
+import browser from 'browser';
+import loading from 'loading';
+import playbackManager from 'playbackManager';
+import appRouter from 'appRouter';
+import globalize from 'globalize';
+import appHost from 'apphost';
 
 function mirrorItem(info, player) {
 
@@ -77,7 +83,7 @@ define(['appSettings', 'events', 'browser', 'loading', 'playbackManager', 'appRo
     }
 }
 
-    function showPlayerSelection(button) {
+export function show(button) {
 
     var currentPlayerInfo = playbackManager.getPlayerInfo();
 
@@ -314,7 +320,6 @@ define(['appSettings', 'events', 'browser', 'loading', 'playbackManager', 'appRo
     loading.hide();
 });
 
-    return {
+export default {
-        show: showPlayerSelection
+    show: show
 };
-});

src/components/playback/playersettingsmenu.js

@@ -1,5 +1,8 @@
-define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings', 'qualityoptions'], function (connectionManager, actionsheet, datetime, playbackManager, globalize, appSettings, qualityoptions) {
+import connectionManager from 'connectionManager';
-    'use strict';
+import actionsheet from 'actionsheet';
+import playbackManager from 'playbackManager';
+import globalize from 'globalize';
+import qualityoptions from 'qualityoptions';
 
 function showQualityMenu(player, btn) {
 
@@ -225,7 +228,7 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
     });
 }
 
-    function show(options) {
+export function show(options) {
     var player = options.player;
     var currentItem = playbackManager.currentItem(player);
 
@@ -264,7 +267,6 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
     return Promise.reject();
 }
 
-    return {
+export default {
     show: show
 };
-});

src/components/playback/playmethodhelper.js

@@ -1,7 +1,4 @@
-define([], function () {
+export function getDisplayPlayMethod(session) {
-    'use strict';
-
-    function getDisplayPlayMethod(session) {
 
     if (!session.NowPlayingItem) {
         return null;
@@ -18,7 +15,6 @@ define([], function () {
     }
 }
 
-    return {
+export default {
     getDisplayPlayMethod: getDisplayPlayMethod
 };
-});

src/components/playback/volumeosd.js

@@ -1,5 +1,9 @@
-define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'material-icons'], function (events, playbackManager, dom, browser) {
+import events from 'events';
-    'use strict';
+import playbackManager from 'playbackManager';
+import dom from 'dom';
+import browser from 'browser';
+import 'css!./iconosd';
+import 'material-icons';
 
 var currentPlayer;
 var osdElement;
@@ -155,5 +159,3 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
 });
 
 bindToPlayer(playbackManager.getCurrentPlayer());
-
-});