11:54 a.m.
Author: phuong_vu
Date: 2010-10-30 05:54:44 -0400 (Sat, 30 Oct 2010)
New Revision: 4875
Modified:
portal/branches/branch-GTNPORTAL-1592/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js
portal/branches/branch-GTNPORTAL-1592/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector2.gtmpl
portal/branches/branch-GTNPORTAL-1592/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageSelector2.java
Log:
GTNPORTAL-1609 Can't do any action after open 3 Popup Window
Modified:
portal/branches/branch-GTNPORTAL-1592/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js
===================================================================
---
portal/branches/branch-GTNPORTAL-1592/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2010-10-29
16:26:26 UTC (rev 4874)
+++
portal/branches/branch-GTNPORTAL-1592/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2010-10-30
09:54:44 UTC (rev 4875)
@@ -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:
portal/branches/branch-GTNPORTAL-1592/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector2.gtmpl
===================================================================
---
portal/branches/branch-GTNPORTAL-1592/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector2.gtmpl 2010-10-29
16:26:26 UTC (rev 4874)
+++
portal/branches/branch-GTNPORTAL-1592/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector2.gtmpl 2010-10-30
09:54:44 UTC (rev 4875)
@@ -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">
Modified:
portal/branches/branch-GTNPORTAL-1592/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageSelector2.java
===================================================================
---
portal/branches/branch-GTNPORTAL-1592/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageSelector2.java 2010-10-29
16:26:26 UTC (rev 4874)
+++
portal/branches/branch-GTNPORTAL-1592/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageSelector2.java 2010-10-30
09:54:44 UTC (rev 4875)
@@ -65,6 +65,7 @@
super("UIPageSelector2", null);
UIFormPopupWindow uiPopup = addChild(UIFormPopupWindow.class, null,
"PopupPageSelector2");
uiPopup.setWindowSize(900, 400);
+ uiPopup.setShowMask(true);
uiPopup.setRendered(false);
UIPageBrowser uiPageBrowser = createUIComponent(UIPageBrowser.class,
"SelectPage", null);
uiPopup.setUIComponent(uiPageBrowser);