Author: theute Date: 2011-10-31 09:07:43 -0400 (Mon, 31 Oct 2011) New Revision: 7915 Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector2.gtmpl Log: JBEPP-1321: Can't do any action after open 3 Popup Windown Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2011-10-31 08:42:14 UTC (rev 7914) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2011-10-31 13:07:43 UTC (rev 7915) @@ -69,17 +69,20 @@ UIPopupWindow.prototype.showMask = function(popup, isShowPopup) { var mask = popup.previousSibling; + //Make sure mask is not TextNode because of previousSibling property + if (mask && mask.className != "MaskLayer") { + mask = null; + } if(isShowPopup) { //Modal if popup is portal component if (eXo.core.DOMUtil.findAncestorByClass(popup, "PORTLET-FRAGMENT") == null) { - eXo.core.UIMaskLayer.createMask(popup.parentNode, popup, 1) ; + if(!mask) eXo.core.UIMaskLayer.createMask(popup.parentNode, popup, 1) ; } else { - //If popup is portlet's component, modal with just its parent - eXo.core.UIMaskLayer.createMaskForFrame(popup.parentNode, popup, 1) ; + //If popup is portlet's component, modal with just its parent + if(!mask) eXo.core.UIMaskLayer.createMaskForFrame(popup.parentNode, popup, 1) ; } - } else { - //Make sure mask is not TextNode because of previousSibling property - if(mask != null && mask.className == "MaskLayer") eXo.core.UIMaskLayer.removeMask(mask) ; + } else { + if(mask) eXo.core.UIMaskLayer.removeMask(mask) ; } } ; Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector2.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector2.gtmpl 2011-10-31 08:42:14 UTC (rev 7914) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector2.gtmpl 2011-10-31 13:07:43 UTC (rev 7915) @@ -108,7 +108,7 @@ </div> <% } %> - <div class="ActionButton SimpleStyle" onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIPopupWindow.class).getId();%>');"> + <div class="ActionButton SimpleStyle" onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIPopupWindow.class).getId();%>', true);"> <div class="ButtonLeft"> <div class="ButtonRight"> <div class="ButtonMiddle">