[gatein-commits] gatein SVN: r5643 - portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui.
Author: phuong_vu
Date: 2010-12-24 05:01:14 -0500 (Fri, 24 Dec 2010)
New Revision: 5643
Modified:
portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js
Log:
GTNPORTAL-1658 Add gadget window in the dashboard can't be closed or moved
Modified:
portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
===================================================================
---
portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2010-12-24
09:22:56 UTC (rev 5642)
+++
portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2010-12-24
10:01:14 UTC (rev 5643)
@@ -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";
};
/**
@@ -539,4 +542,4 @@
};
};
-eXo.webui.UIDashboard = new UIDashboard();
\ No newline at end of file
+eXo.webui.UIDashboard = new UIDashboard();
Modified:
portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js
===================================================================
---
portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2010-12-24
09:22:56 UTC (rev 5642)
+++
portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2010-12-24
10:01:14 UTC (rev 5643)
@@ -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";
@@ -285,4 +288,4 @@
DragDrop.init(null, clickBlock, dragBlock, evt) ;
} ;
-eXo.webui.UIPopupWindow = new UIPopupWindow();
\ No newline at end of file
+eXo.webui.UIPopupWindow = new UIPopupWindow();