X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=921e524276caabc18a9523b9002cd2153dc98523;hb=f1c91fd023ad0bbd01a386bca4d8503e0e27df73;hp=a60c4616aff29c624e66f61b69a65a84002bbeed;hpb=af961d58c244224c14f3bb519214485cb670c64d;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index a60c461..921e524 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -16,13 +16,6 @@ jQuery.fn.extend({
 	 *   $(this).removeClass("selected");
 	 * });
 	 * 
-	 * @test var count = 0;
-	 * var fn1 = function() { count++; }
-	 * var fn2 = function() { count--; }
-	 * var link = $('#mark');
-	 * link.click().toggle(fn1, fn2).click().click().click().click().click();
-	 * ok( count == 1, "Check for toggle(fn, fn)" );
-	 *
 	 * @name toggle
 	 * @type jQuery
 	 * @param Function even The function to execute on every even click.
@@ -1527,50 +1520,6 @@ new function(){
 		 * @type jQuery
 		 * @cat Events/Mouse
 		 */
-		 
-		 /**
-		  * @test var count;
-		  * // ignore load
-		  * var e = ("blur,focus,resize,scroll,unload,click,dblclick," +
-		  * 		"mousedown,mouseup,mousemove,mouseover,mouseout,change,reset,select," + 
-		  * 		"submit,keydown,keypress,keyup,error").split(",");
-		  * var handler1 = function(event) {
-		  * 	count++;
-		  * };
-		  * var handler2 = function(event) {
-		  * 	count++;
-		  * };
-		  * for( var i=0; i < e.length; i++) {
-		  * 	var event = e[i];
-		  * 	count = 0;
-		  * 	// bind handler
-		  * 	$(document)[event](handler1);
-		  *		$(document)[event](handler2);
-		  * 	$(document)["one"+event](handler1);
-		  * 	
-		  * 	// call event two times
-		  * 	$(document)[event]();
-		  * 	$(document)[event]();
-		  * 	
-		  * 	// unbind events
-		  * 	$(document)["un"+event](handler1);
-		  * 	// call once more
-		  * 	$(document)[event]();
-		  *
-		  * 	// remove all handlers
-		  *		$(document)["un"+event]();
-		  *
-		  * 	// call once more
-		  * 	$(document)[event]();
-		  * 	
-		  * 	// assert count
-		  *     ok( count == 6, 'Checking event ' + event);
-		  * }
-		  *
-		  * @private
-		  * @name eventTesting
-		  * @cat Events
-		  */
 
 	var e = ("blur,focus,load,resize,scroll,unload,click,dblclick," +
 		"mousedown,mouseup,mousemove,mouseover,mouseout,change,reset,select," + 
@@ -1592,20 +1541,16 @@ new function(){
 		
 		// Finally, handle events that only fire once
 		jQuery.fn["one"+o] = function(f){
-			// Attach the event listener
-			return this.each(function(){
-
-				var count = 0;
-
-				// Add the event
-				jQuery.event.add( this, o, function(e){
-					// If this function has already been executed, stop
-					if ( count++ ) return true;
-				
-					// And execute the bound function
-					return f.apply(this, [e]);
-				});
-			});
+			// save cloned reference to this
+			var element = jQuery(this);
+			var handler = function() {
+				// unbind itself when executed
+				element.unbind(o, handler);
+				element = null;
+				// apply original handler with the same arguments
+				f.apply(this, arguments);
+			};
+			return this.bind(o, handler);
 		};
 			
 	};
@@ -1625,11 +1570,12 @@ new function(){
 	
 		// Use the defer script hack
 		var script = document.getElementById("__ie_init");
-		script.onreadystatechange = function() {
-			if ( this.readyState != "complete" ) return;
-			this.parentNode.removeChild( this );
-			jQuery.ready();
-		};
+		if (script) // script does not exist if jQuery is loaded dynamically
+			script.onreadystatechange = function() {
+				if ( this.readyState != "complete" ) return;
+				this.parentNode.removeChild( this );
+				jQuery.ready();
+			};
 	
 		// Clear from memory
 		script = null;