Author: mwringe Date: 2010-03-25 16:42:17 -0400 (Thu, 25 Mar 2010) New Revision: 2367 Added: portal/trunk/skins/ portal/trunk/skins/simpleskin/ portal/trunk/skins/simpleskin/target/ portal/trunk/skins/simpleskin/target/war/ portal/trunk/skins/simpleskin/target/war/work/ Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java Log: GTNPORTAL-495: expand all on the sitemap would only work if a flag was set saying the nodes were not already expanded, but this flag was not always being set properly. Removing this flag as even if it was being set correctly it still cannot determine if a node or page has been added or removed since the last expansion. Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-03-25 13:03:25 UTC (rev 2366) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-03-25 20:42:17 UTC (rev 2367) @@ -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/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2010-03-25 13:03:25 UTC (rev 2366) +++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2010-03-25 20:42:17 UTC (rev 2367) @@ -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/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2010-03-25 13:03:25 UTC (rev 2366) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2010-03-25 20:42:17 UTC (rev 2367) @@ -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); }