Changeset 5582

Timestamp:

05/13/08 17:27:17 (3 months ago)

Author:

scott.gonzalez

Message:

UI Dialog: Fixed #2804: Delay event binding for overlays.

Files:

• trunk/ui/ui.dialog.js (modified) (1 diff)

trunk/ui/ui.dialog.js

@@ -310 +310 @@
             if (this.instances.length === 0) {
                 // prevent use of anchors and inputs
-                $('a, :input').bind(this.events, function() {
-                    // allow use of the element if inside a dialog and
-                    // - there are no modal dialogs
-                    // - there are modal dialogs, but we are in front of the topmost modal
-                    var allow = false;
-                    var $dialog = $(this).parents('.ui-dialog');
-                    if ($dialog.length) {
-                        var $overlays = $('.ui-dialog-overlay');
-                        if ($overlays.length) {
-                            var maxZ = parseInt($overlays.css('z-index'), 10);
-                            $overlays.each(function() {
-                                maxZ = Math.max(maxZ, parseInt($(this).css('z-index'), 10));
-                            });
-                            allow = parseInt($dialog.css('z-index'), 10) > maxZ;
-                        } else {
-                            allow = true;
+                // we use a setTimeout in case the overlay is created from an
+                // event that we're going to be cancelling (see #2804)
+                setTimeout(function() {
+                    $('a, :input').bind($.ui.dialog.overlay.events, function() {
+                        // allow use of the element if inside a dialog and
+                        // - there are no modal dialogs
+                        // - there are modal dialogs, but we are in front of the topmost modal
+                        var allow = false;
+                        var $dialog = $(this).parents('.ui-dialog');
+                        if ($dialog.length) {
+                            var $overlays = $('.ui-dialog-overlay');
+                            if ($overlays.length) {
+                                var maxZ = parseInt($overlays.css('z-index'), 10);
+                                $overlays.each(function() {
+                                    maxZ = Math.max(maxZ, parseInt($(this).css('z-index'), 10));
+                                });
+                                allow = parseInt($dialog.css('z-index'), 10) > maxZ;
+                            } else {
+                                allow = true;
+                            }
                         }
-                    }
-                    return allow;
-                });
+                        return allow;
+                    });
+                }, 1);
                 
                 // allow closing by pressing the escape key