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
@@ -814,8 +814,8 @@ function initClient() {
        define('tvguide', [componentsPath + '/guide/guide'], returnFirstDependency);
        define('guide-settings-dialog', [componentsPath + '/guide/guide-settings'], returnFirstDependency);
        define('viewManager', [componentsPath + '/viewManager/viewManager'], function (viewManager) {
-            window.ViewManager = viewManager;
-            viewManager.dispatchPageEvents(true);
+            window.ViewManager = viewManager.default;
+            viewManager.default.dispatchPageEvents(true);
            return viewManager;
        });
        define('slideshow', [componentsPath + '/slideshow/slideshow'], returnFirstDependency);