fixing a bug with sub and getting default and pause events to work well enough for menuable

Author: Pinhook

event/default/default.js

@@ -110,7 +110,12 @@ $event.special["default"] = {
 				a.handler.call(a.element, event, a.data);
 				event.handled = event.handled === null ? oldHandle : true;
 	        }
-	        event._defaultActions = null; //set to null so everyone else on this element ignores it
+	        
+			event._defaultActions = null; //set to null so everyone else on this element ignores it
+	        
+			if(event._success){
+				event._success();
+			}
 	    }
 	}
 }
@@ -145,7 +150,9 @@ $event.trigger =  function defaultTriggerer( event, data, elem, bubbling){
 	oldTrigger.call($.event, event, data, elem, bubbling);
 	checkAndRunDefaults(event, elem);
 
-}
+};
+
+
 /**
  * @add jQuery.fn
  */
@@ -193,7 +200,30 @@ triggerDefaults = function(type, data){
 	}
 	return true;
 }
+
+$.fn.
+/**
+ * Triggers an event and calls success if the event is complete
+ * @param {Object} type
+ * @param {Object} data
+ * @param {Object} success
+ * @param {Object} prevented
+ */
+triggerAsync = function(type, data, success, prevented){
+	if(typeof data == 'function'){
+		success = data;
+		data = undefined;
+	}
 
+	if ( this[0] ) {
+		var event = $.Event( type );
+		//event._success= success;
+		jQuery.event.trigger( {type: type, _success: success}, data, this[0]  );
+	} else{
+		success.call(this);
+	}
+	return this;
+}
 
 
 

event/default/default_pause_test.js

@@ -48,6 +48,8 @@ test("default and pause with live", function(){
 			setTimeout(function(){
 				start();
 				same(order,['show','default'])
+				$("#foo").die("show");
+				$("#foo").die("default.show");
 			},30)
 		},50)
 	});
@@ -57,4 +59,39 @@ test("default and pause with live", function(){
 
 });
 
+
+test("triggerAsync", function(){
+	$("#qunit-test-area").html("<div id='foo'>hello</div>")
+	
+	var order = [];
+	stop();
+	
+	$("#foo").live("default.show", function(){
+		order.push("default")
+	});
+	$("#foo").live("show", function(ev){
+		order.push('show')
+		ev.pause();
+		setTimeout(function(){
+			ev.resume();
+			setTimeout(function(){
+				start();
+				same(order,['show','default','async'])
+			},30)
+		},50)
+	});
+	
+	
+	$("#foo").triggerAsync("show", function(){
+		order.push("async")
+	})
+});
+
+test("triggerAsync with nothing", function(){
+	$("#fool").triggerAsync("show", function(){
+		ok(true)
+	})
+});
+
+
 });

event/pause/pause.js

@@ -42,7 +42,7 @@ $.Event.prototype.resume = function(){
 	if(!this.isPropagationStopped()){
 		if(el.parentNode){
 			// resume trigger like this so default doesn't get confused
-			$.event.trigger( this, this.data, el.parentNode , true);
+			$.event.trigger( this, [this], el.parentNode , true);
 		} else if($.event.special['default']){ 
 
 			$.event.special['default'].checkAndRunDefaults(this,el)

lang/lang.js

@@ -27,13 +27,13 @@ steal.plugins('jquery').then(function( $ ) {
 				current,
 				ret, 
 				i,
-				j,
+				c = 0,
 				type;
 
 			if(length == 0){
 				return currents[0];
 			}
-			while(current = currents.shift()){
+			while(current = currents[c++]){
 				for (i =0; i < length - 1 && isContainer(current); i++ ) {
 					current = getNext(current, parts[i], add);
 				}

lang/lang_test.js

@@ -14,6 +14,10 @@ test("$.String.sub", function(){
 
 });
 
+test("$.String.sub double", function(){
+	equals($.String.sub("{b} {d}",[{b: "c", d: "e"}]),"c e");
+})
+
 test("String.underscore", function(){
 	equals($.String.underscore("Foo.Bar.ZarDar"),"foo.bar.zar_dar")
 })
@@ -23,6 +27,8 @@ test("$.String.getObject", function(){
 	var obj = $.String.getObject("foo", [{a: 1}, {foo: 'bar'}]);
 
 	equals(obj,'bar', 'got bar')
-})
+});
+
+
 
 });