Author: nbelaevski Date: 2009-03-25 11:47:45 -0400 (Wed, 25 Mar 2009) New Revision: 13180 Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx Log: https://jira.jboss.org/jira/browse/RF-6548 Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java =================================================================== --- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2009-03-25 15:33:11 UTC (rev 13179) +++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2009-03-25 15:47:45 UTC (rev 13180) @@ -66,9 +66,7 @@ for (int i=0;i<level;i++){ writer.startElement("img", component); writer.writeAttribute("src", src, null); - writer.writeAttribute("alt", " ", null); - writer.writeAttribute("hspace", "0", null); - writer.writeAttribute("vspace", "0", null); + writer.writeAttribute("alt", "", null); writer.writeAttribute("height", String.valueOf(w), null); writer.writeAttribute("width", String.valueOf(w), null); writer.endElement("img"); @@ -278,9 +276,7 @@ writer.writeAttribute("style", "display: none;", null); } writer.writeAttribute("src", imageSrc, null); - writer.writeAttribute("alt", " ", null); - writer.writeAttribute("vspace", "0", null); - writer.writeAttribute("hspace", "0", null); + writer.writeAttribute("alt", "", null); writer.writeAttribute("width", String.valueOf(h), null); writer.writeAttribute("height", String.valueOf(h), null); writer.writeAttribute("id", id, null); Modified: trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx =================================================================== --- trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx 2009-03-25 15:33:11 UTC (rev 13179) +++ trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx 2009-03-25 15:47:45 UTC (rev 13180) @@ -40,11 +40,7 @@ <f:call name="utils.encodeBeginFormIfNessesary"/> <div style="width:#{component.width}; #{style}" class="rich-pmenu #{component.styleClass}" id="#{clientId}" - onclick="#{component.onclick}" - ondblclick="#{component.ondblclick}" - onmousemove="#{component.onmousemove}" - onmouseout="#{component.onmouseout}" - onmouseover="#{component.onmouseover}" > + x:passThruWithExclusions="style,width,class,styleClass,id"> <input type="hidden" id="#{clientId}selectedItemName" name="#{clientId}selectedItemName" value="" /> <vcp:body> <f:call name="renderChildren" /> Modified: trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx =================================================================== --- trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2009-03-25 15:33:11 UTC (rev 13179) +++ trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2009-03-25 15:47:45 UTC (rev 13180) @@ -23,9 +23,8 @@ <table cellspacing="0" cellpadding="0" border="0" id="tablehide#{clientId}" class="#{this:getTableClass(context, component)} rich-pmenu-group #{this:getFullStyleClass( context, component )} " - style="#{this:getFullStyle( context, component )}" > - - <f:call name="utils.encodePassThru" /> + style="#{this:getFullStyle( context, component )}" + x:passThruWithExclusions="cellspacing,cellpadding,border,id,class,styleClass,style"> <tbody> <tr id="row_#{clientId}" Modified: trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx =================================================================== --- trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2009-03-25 15:33:11 UTC (rev 13179) +++ trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2009-03-25 15:47:45 UTC (rev 13180) @@ -17,12 +17,8 @@ <table cellspacing="0" cellpadding="0" border="0" id="tablehide#{clientId}" class="dr-pmenu-item rich-pmenu-item #{this:getFullStyleClass( context, component )} " - style="#{this:getFullStyle( context, component )}" > - - <f:call name="utils.encodeAttributes"> - <f:parameter value="onclick,onmousedown,onmouseup,onmousemove" /> - </f:call> - + style="#{this:getFullStyle( context, component )}" + x:passThruWithExclusions="cellspacing,cellpadding,border,id,class,styleClass,style"> <tbody> <tr id="row_#{clientId}" class="#{this:getSelectedClass( context, component )}" >