merge remote-tracking branch 'upstream/master' into firefox

2019-12-03 23:14:20 +09:00
parent 375934ed13 f32e3dfcf9
commit 69b90fa9cb
212 changed files with 4277 additions and 1769 deletions
@@ -50,8 +50,7 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi
            if (options.autoFocus !== false) {
                focusManager.autoFocus(view);
            }
-        }
-        else if (!layoutManager.mobile) {
+        } else if (!layoutManager.mobile) {
            if (view.activeElement && document.body.contains(view.activeElement) && focusManager.isCurrentlyFocusable(view.activeElement)) {
                focusManager.focus(view.activeElement);
            } else {