merge branch master into comic-reader

2020-08-30 14:58:37 +09:00
parent dfc906e7d3 507b477117
commit 5c2ec66420
21 changed files with 1894 additions and 1878 deletions
@@ -222,6 +222,7 @@ function initClient() {
                });
                require(['mouseManager']);
                require(['focusPreventScroll']);
+                require(['vendorStyles']);
                require(['autoFocuser'], function(autoFocuser) {
                    autoFocuser.enable();
                });
@@ -656,6 +657,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);