unpoly-rails 3.0.0.rc4 → 3.0.0

data/assets/unpoly/unpoly.js

@@ -5,7 +5,7 @@
 /***/ (() => {
 
 window.up = {
-    version: '3.0.0-rc4'
+    version: '3.0.0'
 };
 
 
@@ -9604,19 +9604,14 @@ up.form = (function () {
     function disableContainer(container) {
         let focusedElement = document.activeElement;
         let focusFallback;
-        let mayLoseFocus = container.contains(focusedElement);
-        if (mayLoseFocus) {
-            let focusedGroup = findGroup(focusedElement);
-            if (container.contains(focusedGroup) || container === focusedElement) {
-                focusFallback = focusedGroup;
-            }
-            else {
-                focusFallback = container;
+        let controls = [...findFields(container), ...findSubmitButtons(container)];
+        for (let control of controls) {
+            if (control === focusedElement) {
+                focusFallback = findGroup(focusedElement);
             }
+            raiseDisableStack(control);
         }
-        let controls = [...findFields(container), ...findSubmitButtons(container)];
-        controls.forEach(raiseDisableStack);
-        if (focusFallback && !focusFallback.contains(document.activeElement)) {
+        if (focusFallback) {
             up.focus(focusFallback, { force: true, preventScroll: true });
         }
         return function () {