[richfaces-svn-commits] JBoss Rich Faces SVN: r3816 - in trunk/ui/panelmenu/src: main/templates/org/richfaces and 1 other directories.

Author: sergeyhalipov Date: 2007-11-08 07:21:58 -0500 (Thu, 08 Nov 2007) New Revision: 3816 Modified: trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx trunk/ui/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java Log: http://jira.jboss.com/jira/browse/RF-1311 Modified: trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js =================================================================== --- trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-11-08 11:59:37 UTC (rev 3815) +++ trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-11-08 12:21:58 UTC (rev 3816) @@ -49,7 +49,7 @@ this.hoveredStyles = hoveredStyles; this.hoveredClasses = hoveredClasses; - this.tdhider = $("tdhide"+ids.myId); + this.tdhider = $(ids.myId); this.tablehider = $("tablehide"+ids.myId); this.haveDynamicIcon = haveDynamicIcon; if (this.haveDynamicIcon==true) @@ -74,7 +74,7 @@ this.selected = false; } this.clientId = ids.myId; - this.obj = $("tdhide" + ids.myId); + this.obj = $(ids.myId); this.leftIcon = $('leftIcon' + ids.myId); this.rightIcon = $('rightIcon' + ids.myId); this.labelArea = $('icon' + ids.myId); Modified: trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx =================================================================== --- trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-11-08 11:59:37 UTC (rev 3815) +++ trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-11-08 12:21:58 UTC (rev 3816) @@ -13,7 +13,7 @@ <f:clientid var="clientId"/> - <div id="tdhide#{clientId}" style="#{this:getHideStyle(context, component)}" + <div id="#{clientId}" style="#{this:getHideStyle(context, component)}" class="#{this:getDivClass(context, component)}" > <jsp:scriptlet> <![CDATA[ Modified: trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx =================================================================== --- trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2007-11-08 11:59:37 UTC (rev 3815) +++ trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2007-11-08 12:21:58 UTC (rev 3816) @@ -13,7 +13,7 @@ <f:clientid var="clientId"/> - <div id="tdhide#{clientId}" style="#{this:getHideStyle(context, component)}" > + <div id="#{clientId}" style="#{this:getHideStyle(context, component)}" > <table cellspacing="0" cellpadding="0" border="0" id="tablehide#{clientId}" class="dr-pmenu-item rich-pmenu-item #{this:getFullStyleClass( context, component )} " Modified: trunk/ui/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java =================================================================== --- trunk/ui/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java 2007-11-08 11:59:37 UTC (rev 3815) +++ trunk/ui/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java 2007-11-08 12:21:58 UTC (rev 3816) @@ -68,6 +68,8 @@ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); javaScripts.add("org/richfaces/renderkit/html/scripts/utils.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/panelMenu.js"); + javaScripts.add("org/ajax4jsf/javascript/scripts/form.js"); + javaScripts.add("org/richfaces/renderkit/html/scripts/form.js"); } /** @@ -197,7 +199,7 @@ assertNotNull(div); assertEquals("div", div.getNodeName()); - HtmlElement firstGroupDiv = page.getHtmlElementById("tdhide" + group1.getClientId(facesContext)); + HtmlElement firstGroupDiv = page.getHtmlElementById(group1.getClientId(facesContext)); assertNotNull(firstGroupDiv); assertEquals("div", firstGroupDiv.getNodeName()); @@ -214,7 +216,7 @@ assertTrue(styleClass.contains("rich-pmenu-disabled-element")); assertTrue(styleClass.contains("dr-pmenu-disabled-element")); - HtmlElement subGroupDiv = page.getHtmlElementById("tdhide" + group3.getClientId(facesContext)); + HtmlElement subGroupDiv = page.getHtmlElementById(group3.getClientId(facesContext)); assertNotNull(subGroupDiv); assertEquals("div", subGroupDiv.getNodeName());