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

2020-08-07 09:29:15 +01:00
parent b8c4871004 c5550c5771
commit b44ca55f0c
57 changed files with 3305 additions and 3026 deletions
@@ -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';

+    viewManager = viewManager.default || viewManager;
    playbackManager = playbackManager.default || playbackManager;
    browser = browser.default || browser;
    layoutManager = layoutManager.default || layoutManager;
@@ -807,6 +808,8 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
        navDrawerScrollContainer.addEventListener('click', onMainDrawerClick);
        return new Promise(function (resolve, reject) {
            require(['navdrawer'], function (navdrawer) {
+                navdrawer = navdrawer.default || navdrawer;
+
                navDrawerInstance = new navdrawer(getNavDrawerOptions());

                if (!layoutManager.tv) {