Merge branch 'master' into polyfill-lint

2020-04-10 06:28:59 +02:00
parent 56ff47658b c3bc69ca57
commit acbe7730b8
84 changed files with 1172 additions and 809 deletions
@@ -579,8 +579,8 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM

    function showDirect(path) {
        return new Promise(function(resolve, reject) {
-            resolveOnNextShow = resolve, page.show(baseUrl()+path)
-        })
+            resolveOnNextShow = resolve, page.show(baseUrl()+path);
+        });
    }

    function show(path, options) {