[gatein-commits] gatein SVN: r5086 - exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui.

[do-not-reply at jboss.org]

Author: phuong_vu
Date: 2010-11-15 02:18:50 -0500 (Mon, 15 Nov 2010)
New Revision: 5086

Modified:
   exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
   exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js
Log:
EXOGTN-128 "Add gadget" window in the dashboard can't be closed or moved

Modified: exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
===================================================================
--- exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js	2010-11-15 04:37:32 UTC (rev 5085)
+++ exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js	2010-11-15 07:18:50 UTC (rev 5086)
@@ -393,6 +393,9 @@
 		if(!popup || popup.style.display == "none") return;
 		var uiDashboard = eXo.core.DOMUtil.findAncestorByClass(popup, "UIDashboard");
 		var deltaY = Math.ceil((uiDashboard.offsetHeight - popup.offsetHeight) / 2);
+		if (deltaY < 0) {
+			deltaY = 0;
+		}
 		popup.style.top = eXo.core.Browser.findPosY(uiDashboard) + deltaY + "px";
 	};
 	/**

Modified: exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js
===================================================================
--- exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js	2010-11-15 04:37:32 UTC (rev 5085)
+++ exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js	2010-11-15 07:18:50 UTC (rev 5086)
@@ -37,6 +37,9 @@
 	
 	//TODO Lambkin: this statement create a bug in select box component in Firefox
 	//this.superClass.init(popup) ;
+	if (isShow) {
+		popup.style.display = "block";
+	}
 	var contentBlock = DOMUtil.findFirstDescendantByClass(popup, 'div' ,'PopupContent');
 	if(contentBlock && (eXo.core.Browser.getBrowserHeight() - 100 < contentBlock.offsetHeight)) {
 		contentBlock.style.height = (eXo.core.Browser.getBrowserHeight() - 100) + "px";