[richfaces-svn-commits] JBoss Rich Faces SVN: r5023 - in trunk/ui/contextMenu/src/main: java/org/richfaces/renderkit/html and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: sergeyhalipov
Date: 2007-12-26 13:52:07 -0500 (Wed, 26 Dec 2007)
New Revision: 5023

Modified:
   trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMenu.java
   trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java
   trunk/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js
Log:
http://jira.jboss.com/jira/browse/RF-1456

Modified: trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMenu.java
===================================================================
--- trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMenu.java	2007-12-26 18:18:49 UTC (rev 5022)
+++ trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMenu.java	2007-12-26 18:52:07 UTC (rev 5023)
@@ -42,4 +42,7 @@
     
     public abstract void setDisableDefaultMenu(boolean b); 
     
+    public abstract void setShowDelay(Integer showDelay);
+    public abstract Integer getShowDelay();
+    
 }

Modified: trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java
===================================================================
--- trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java	2007-12-26 18:18:49 UTC (rev 5022)
+++ trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java	2007-12-26 18:52:07 UTC (rev 5023)
@@ -110,7 +110,8 @@
 		writer.startElement("script", component);
 		writer.writeText("new Richfaces.ContextMenu('", null);
 		writer.writeText(component.getClientId(context), null);
-		writer.writeText("',", null);
+		writer.writeText("', ", null);
+		writer.writeText(menu.getShowDelay() + ", ", null);
 		writeScriptBody(context, component, true);
 		writer.writeText(")", null);
 		writer.writeText(getClientAttachmentOptions(context, menu), null);

Modified: trunk/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js
===================================================================
--- trunk/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js	2007-12-26 18:18:49 UTC (rev 5022)
+++ trunk/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js	2007-12-26 18:52:07 UTC (rev 5023)
@@ -3,13 +3,14 @@
 
 Richfaces.ContextMenu.prototype = {
 	
-	initialize: function(id, evaluator, options) {
+	initialize: function(id, delay, evaluator, options) {
 		this.options = options || {};
 		this.id = id;
 		this.evaluator = evaluator;
 		$(id).component = this;
 		this.doShow = this.show;
 		this.doHide = this.hide;
+		this.delay = delay;
 	},
 	
 	attachToParent : function(id, event, context) {
@@ -40,8 +41,8 @@
 	show: function(event, context) {
 		this.construct(context);
 		event.parameters = context;
-		new RichFaces.Menu.DelayedContextMenu(this.id + "_menu", event).show();
-		//Event.stop(event||window.event);
+		var delayedMenu = new RichFaces.Menu.DelayedContextMenu(this.id + "_menu", event);
+		window.setTimeout(delayedMenu.show, this.delay);
 	},
 	
 	construct: function(context) {