[gatein-commits] gatein SVN: r2369 - in portal/branches/EPP_5_0_Branch: web/portal/src/main/webapp/groovy/webui/core and 1 other directories.
Author: mpodolin
Date: 2010-03-26 05:26:19 -0400 (Fri, 26 Mar 2010)
New Revision: 2369
Modified:
portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl
portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java
Log:
JBEPP-211: GTNPORTAL-495 ported to the EPP branch
Modified:
portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js
===================================================================
---
portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-03-25
20:54:53 UTC (rev 2368)
+++
portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-03-26
09:26:19 UTC (rev 2369)
@@ -558,10 +558,6 @@
return true;
};
-UIPortal.prototype.expandAll = function(element) {
- if (this.isExpandAll==true) return true;
- return false;
-};
/*
* This method will start the creation of a new javascript application such as a widget
*
Modified:
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl
===================================================================
---
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2010-03-25
20:54:53 UTC (rev 2368)
+++
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2010-03-26
09:26:19 UTC (rev 2369)
@@ -104,7 +104,7 @@
<div class="CollapseAll FloatLeft"
onclick="eXo.portal.UIPortal.collapseExpand(this);$actionCollapseAll">
<%=_ctx.appRes(siteMapPortlet.getName() + ".label.CollapseAll")%>
</div>
- <div class="ExpandAll FloatLeft"
onclick="if(!eXo.portal.UIPortal.expandAll(this)){$actionExpandAll}">
+ <div class="ExpandAll FloatLeft"
onclick="{$actionExpandAll}">
<%=_ctx.appRes(siteMapPortlet.getName() + ".label.ExpandAll")%>
</div>
</div>
Modified:
portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java
===================================================================
---
portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2010-03-25
20:54:53 UTC (rev 2368)
+++
portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2010-03-26
09:26:19 UTC (rev 2369)
@@ -330,9 +330,6 @@
uiNavigation.loadTreeNodes();
- JavascriptManager jsManager = prContext.getJavascriptManager();
- jsManager.addJavascript("eXo.portal.UIPortal.isExpandAll=false;");
-
event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigation);
}
}
@@ -349,9 +346,6 @@
expandAllNode(treeNode);
- JavascriptManager jsManager = prContext.getJavascriptManager();
- jsManager.addJavascript("eXo.portal.UIPortal.isExpandAll=true;");
-
event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigation);
}