[richfaces-svn-commits] JBoss Rich Faces SVN: r15281 - in branches/community/3.3.X/ui/contextMenu/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directory.
Author: Alex.Kolonitsky
Date: 2009-08-24 11:52:18 -0400 (Mon, 24 Aug 2009)
New Revision: 15281
Modified:
branches/community/3.3.X/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java
branches/community/3.3.X/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js
Log:
Parameters not being passed to contextMenu
https://jira.jboss.org/jira/browse/RF-7172
Modified:
branches/community/3.3.X/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java
===================================================================
---
branches/community/3.3.X/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java 2009-08-24
15:38:11 UTC (rev 15280)
+++
branches/community/3.3.X/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java 2009-08-24
15:52:18 UTC (rev 15281)
@@ -46,7 +46,7 @@
/* (non-Javadoc)
* @see org.ajax4jsf.renderkit.RendererBase#getComponentClass()
*/
- protected Class getComponentClass() {
+ protected Class<UIContextMenu> getComponentClass() {
return UIContextMenu.class;
}
@@ -66,18 +66,11 @@
styleClass = "";
}
- writeAttr(writer, HTML.onmousemove_ATTRIBUTE,
layer.getAttributes().get("onmousemove"));
- writeAttr(writer, HTML.onmouseout_ATTRIBUTE,
layer.getAttributes().get("onmouseout"));
- writeAttr(writer, HTML.onmouseover_ATTRIBUTE,
layer.getAttributes().get("onmouseover"));
-
+ getUtils().writeAttribute(writer, HTML.onmousemove_ATTRIBUTE,
layer.getAttributes().get("onmousemove"));
+ getUtils().writeAttribute(writer, HTML.onmouseout_ATTRIBUTE,
layer.getAttributes().get("onmouseout"));
+ getUtils().writeAttribute(writer, HTML.onmouseover_ATTRIBUTE,
layer.getAttributes().get("onmouseover"));
+
writer.writeAttribute(HTML.class_ATTRIBUTE, "rich-menu-list-border " +
styleClass, null);
writer.writeAttribute(HTML.style_ATTRIBUTE, "display: none; z-index: 2; " +
style, null);
}
-
- private void writeAttr(ResponseWriter writer, final String name, final Object value)
throws IOException {
- if (value != null) {
- writer.writeAttribute(name, value, null);
- }
-
- }
}
Modified:
branches/community/3.3.X/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js
===================================================================
---
branches/community/3.3.X/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js 2009-08-24
15:38:11 UTC (rev 15280)
+++
branches/community/3.3.X/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js 2009-08-24
15:52:18 UTC (rev 15281)
@@ -109,11 +109,21 @@
this.element.appendChild(div);
var html = this.evaluator.invoke('getContent', context||{}).join('');
+ html = this.interpolate(html, context);
new Insertion.Top(div, html);
this.menuContent = div;
},
+ interpolate: function (placeholders, context) {
+ for(var k in context) {
+ var v = context[k];
+ var regexp = new RegExp("\\{" + k + "\\}", "g");
+ placeholders = placeholders.replace(regexp, v);
+ }
+ return placeholders;
+ },
+
destroyMenu: function() {
if (this.menuContent) {
window.RichFaces.Memory.clean(this.menuContent);