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

2020-08-05 19:28:06 +01:00
parent 60be236f1c f81126844d
commit b8c4871004
26 changed files with 551 additions and 502 deletions
@@ -1,5 +1,6 @@
 define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost', 'inputManager', 'layoutManager', 'connectionManager', 'appRouter', 'globalize', 'userSettings', 'emby-checkbox', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button', 'flexStyles'], function (require, dom, focusManager, dialogHelper, loading, appHost, inputManager, layoutManager, connectionManager, appRouter, globalize, userSettings) {
    'use strict';
+    focusManager = focusManager.default || focusManager;

    layoutManager = layoutManager.default || layoutManager;