svn commit: r678188 - /tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js

[hlship]

Author: hlship
Date: Sat Jul 19 10:36:48 2008
New Revision: 678188

URL: http://svn.apache.org/viewvc?rev=678188&view=rev
Log:
TAPESTRY-2447: Clicking on a pop-up error bubble hides the bubble, then 
immediately fades it back in

Modified:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js?rev=678188&r1=678187&r2=678188&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js
 Sat Jul 19 10:36:48 2008
@@ -390,11 +390,19 @@
     {
         element = $(element);
 
+        // Update the element with the id of zone div. This may be changed 
dynamically on the client
+        // side.
+
+        element.zone = zoneDiv;
+
         var successHandler = function(transport)
         {
             var reply = transport.responseJSON;
 
-            $(zoneDiv).zone.show(reply.content);
+            // Find the zone id for the element, and from there, the 
Tapestry.Zone object
+            // responsible for the zone.
+
+            $(element.zone).zone.show(reply.content);
 
             Tapestry.processScriptInReply(reply);
         };
@@ -634,6 +642,9 @@
 
 Tapestry.ErrorPopup.prototype = {
 
+    // If the images associated with the error popup are overridden (by 
overriding Tapestry's default.css stylesheet),
+    // then some of these values may also need to be adjusted.
+
     BUBBLE_VERT_OFFSET : -34,
 
     BUBBLE_HORIZONTAL_OFFSET : -20,
@@ -657,6 +668,8 @@
 
         this.outerDiv.observe("click", function(event)
         {
+            this.ignoreNextFocus = true;
+
             this.stopAnimation();
 
             this.outerDiv.hide();
@@ -672,6 +685,12 @@
 
         document.observe(Tapestry.FOCUS_CHANGE_EVENT, function(event)
         {
+            if (this.ignoreNextFocus)
+            {
+                this.ignoreNextFocus = false;
+                return;
+            }
+
             // Tapestry.debug("Focus change: #{memo} for #{field}", { memo: 
event.memo.id, field: this.field.id });
 
             var focused = event.memo;