Merge branch 'master' into migrate-to-ES6-48

src/components/appRouter.js

@@ -1,6 +1,7 @@
 define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdrop', 'browser', 'page', 'appSettings', 'apphost', 'connectionManager'], function (loading, globalize, events, viewManager, skinManager, backdrop, browser, page, appSettings, appHost, connectionManager) {
     'use strict';
 
+    browser = browser.default || browser;
     loading = loading.default || loading;
 
     var appRouter = {

src/components/apphost.js

@@ -1,6 +1,8 @@
 define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'globalize'], function (appSettings, browser, events, htmlMediaHelper, webSettings, globalize) {
     'use strict';
 
+    browser = browser.default || browser;
+
     function getBaseProfileOptions(item) {
         var disableHlsVideoAudioCodecs = [];
 

src/components/guide/guide.js

@@ -2,6 +2,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     'use strict';
 
     playbackManager = playbackManager.default || playbackManager;
+    browser = browser.default || browser;
     loading = loading.default || loading;
 
     function showViewSettings(instance) {

src/components/layoutManager.js

@@ -1,6 +1,8 @@
 define(['browser', 'appSettings', 'events'], function (browser, appSettings, events) {
     'use strict';
 
+    browser = browser.default || browser;
+
     function setLayout(instance, layout, selectedLayout) {
         if (layout === selectedLayout) {
             instance[layout] = true;

src/components/skinManager.js

@@ -1,6 +1,8 @@
 define(['apphost', 'userSettings', 'browser', 'events', 'backdrop', 'globalize', 'require', 'appSettings'], function (appHost, userSettings, browser, events, backdrop, globalize, require, appSettings) {
     'use strict';
 
+    browser = browser.default || browser;
+
     var themeStyleElement;
     var currentThemeId;
 

src/components/slideshow/slideshow.js

@@ -5,6 +5,8 @@
 define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'focusManager', 'browser', 'apphost', 'dom', 'css!./style', 'material-icons', 'paper-icon-button-light'], function (dialogHelper, inputManager, connectionManager, layoutManager, focusManager, browser, appHost, dom) {
     'use strict';
 
+    browser = browser.default || browser;
+
     /**
      * Name of transition event.
      */

src/components/tunerPicker.js

@@ -1,6 +1,7 @@
 define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize', 'loading', 'browser', 'focusManager', 'scrollHelper', 'material-icons', 'formDialogStyle', 'emby-button', 'emby-itemscontainer', 'cardStyle'], function (dialogHelper, dom, layoutManager, connectionManager, globalize, loading, browser, focusManager, scrollHelper) {
     'use strict';
 
+    browser = browser.default || browser;
     loading = loading.default || loading;
 
     var enableFocusTransform = !browser.slow && !browser.edge;

src/libraries/navdrawer/navdrawer.js

@@ -1,6 +1,8 @@
 define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function (browser, dom) {
     "use strict";
 
+    browser = browser.default || browser;
+
     return function (options) {
         function getTouches(e) {
             return e.changedTouches || e.targetTouches || e.touches;

src/libraries/scroller.js

@@ -1,6 +1,8 @@
 define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'scrollStyles'], function (browser, layoutManager, dom, focusManager, ResizeObserver) {
     'use strict';
 
+    browser = browser.default || browser;
+
     /**
 * Return type of the value.
 *

src/scripts/browserDeviceProfile.js

@@ -1,6 +1,8 @@
 define(['browser'], function (browser) {
     'use strict';
 
+    browser = browser.default || browser;
+
     function canPlayH264(videoTestElement) {
         return !!(videoTestElement.canPlayType && videoTestElement.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"').replace(/no/, ''));
     }

src/scripts/libraryMenu.js

@@ -2,6 +2,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
     'use strict';
 
     playbackManager = playbackManager.default || playbackManager;
+    browser = browser.default || browser;
 
     function renderHeader() {
         var html = '';

src/scripts/mouseManager.js

@@ -1,6 +1,8 @@
 define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'dom'], function (inputManager, focusManager, browser, layoutManager, events, dom) {
     'use strict';
 
+    browser = browser.default || browser;
+
     var self = {};
 
     var lastMouseInputTime = new Date().getTime();