Merge branch 'master' into connection-manager-global

2020-09-01 10:16:21 +02:00
parent 73c7dfa0dd 924e8df815
commit 3cbe0f7264
139 changed files with 1032 additions and 3566 deletions
@@ -214,6 +214,7 @@ function initClient() {
                });
                require(['mouseManager']);
                require(['focusPreventScroll']);
+                require(['vendorStyles']);
                require(['autoFocuser'], function(autoFocuser) {
                    autoFocuser.enable();
                });
@@ -517,7 +518,8 @@ function initClient() {
                    'events',
                    'credentialprovider',
                    'connectionManagerFactory',
-                    'appStorage'
+                    'appStorage',
+                    'comicReader'
                ]
            },
            urlArgs: urlArgs,
@@ -647,6 +649,7 @@ function initClient() {
        });
        define('slideshow', [componentsPath + '/slideshow/slideshow'], returnFirstDependency);
        define('focusPreventScroll', ['legacy/focusPreventScroll'], returnFirstDependency);
+        define('vendorStyles', ['legacy/vendorStyles'], returnFirstDependency);
        define('userdataButtons', [componentsPath + '/userdatabuttons/userdatabuttons'], returnFirstDependency);
        define('listView', [componentsPath + '/listview/listview'], returnFirstDependency);
        define('indicators', [componentsPath + '/indicators/indicators'], returnFirstDependency);