svn commit: r689473 - /wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/wicket/ajaxng/js/wicket-ajax-ng.js

[kn...@apache.org]

Author: knopp
Date: Wed Aug 27 06:10:38 2008
New Revision: 689473

URL: http://svn.apache.org/viewvc?rev=689473&view=rev
Log:
cleanup

Modified:
    wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/wicket/ajaxng/js/wicket-ajax-ng.js

Modified: wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/wicket/ajaxng/js/wicket-ajax-ng.js
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/wicket/ajaxng/js/wicket-ajax-ng.js?rev=689473&r1=689472&r2=689473&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/wicket/ajaxng/js/wicket-ajax-ng.js (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/wicket/ajaxng/js/wicket-ajax-ng.js Wed Aug 27 06:10:38 2008
@@ -2489,7 +2489,12 @@
 		return element.wicketEventHandlers;
 	}
 	
-	W.e = function(event, attributes, allowDefault)
+	/**
+	 * Attaches the handler to element specified by attributes to be fired on
+	 * specified event. Makes sure that the previous handler (if any) for given
+	 * component/behavior/event combination is properly detached.
+	 */
+	W.attachEventHandler = function(event, attributes, handler)
 	{
 		var element;
 		if (attributes.c == null)
@@ -2512,7 +2517,14 @@
 			log.trace("Events", "Detaching handle ", handle);
 			handle.detach();			
 		}
+
+		handle = Y.on(event, handler, element);
 		
+		h[key] = handle;
+	}
+	
+	W.e = function(event, attributes, allowDefault)
+	{		
 		var f = function(event) 
 		{			
 			var item = new RequestQueueItem(attributes);
@@ -2523,14 +2535,7 @@
 				event.preventDefault();
 			}
 		}
-		
-		handle = Y.on(event, f, element);
-		
-		h[key] = handle;
-		
-		element = null;
-		h = null;
-		f = null;
+		W.attachEventHandler(event, attributes, f);
 	}
 	
 	window.W = W;