svn commit: r1210407 - /myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js

[lo...@apache.org]

Author: lofwyr
Date: Mon Dec  5 10:48:49 2011
New Revision: 1210407

URL: http://svn.apache.org/viewvc?rev=1210407&view=rev
Log:
TOBAGO-1058: Two Cascading Popups (e.g. Datepicker in a popup) lead to disabled buttons

Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js?rev=1210407&r1=1210406&r2=1210407&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js Mon Dec  5 10:48:49 2011
@@ -30,8 +30,8 @@ Tobago.Popup.setup = function () {
   // The shield is a protection against clicking controls, which are not allowed to click in the modal case.
   // The shield also makes an optical effect (alpha blending).
 
-  // remove all old shields
-  jQuery('.tobago-popup-shield').remove();
+  // hide all old shields
+  jQuery('.tobago-popup-shield').css({visibility:"hidden"});
 
   // find highest modal popup
   var maxZIndex = -Infinity;
@@ -156,14 +156,15 @@ Tobago.Popup.close = function (closeButt
   Tobago.Popup.unlockBehind();
   var popup = jQuery(closeButton).parents('div.tobago-popup:first');
   popup.remove();
-  Tobago.Popup.setup();
+  var maxModalPopup = jQuery('.tobago-popup-shield').filter(":last");
+  maxModalPopup.css({visibility:"visible"});
 };
 
 /**
  * Unlock the parent page of a popup when it is closed
  */
 Tobago.Popup.unlockBehind = function () {
-  var maxModalPopup = jQuery('.tobago-popup-shield').parent();
+  var maxModalPopup = jQuery('.tobago-popup-shield').filter(":last").parent();
   if (maxModalPopup.size() == 0) { // there is no modal popup
     return;
   }