fix global event triggering that i broke in r6323
This commit is contained in:
Brandon Aaron
parent
96fd5f18d4
commit
cbda6c541b
2 changed files with 127 additions and 127 deletions
|
|
@ -214,11 +214,11 @@ jQuery.event = {
|
|||
event.stopPropagation();
|
||||
// Only trigger if we've ever bound an event for it
|
||||
if ( this.global[ type ] ) {
|
||||
for ( var cached in jQuery.cache ) {
|
||||
if ( cached.events && cached.events[ type ] ) {
|
||||
this.trigger( event, data, cached.handle.elem );
|
||||
jQuery.each( jQuery.cache, function() {
|
||||
if ( this.events && this.events[type] ) {
|
||||
jQuery.event.trigger( event, data, this.handle.elem );
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,59 +15,59 @@ test("jQuery.ajax() - success callbacks", function() {
|
|||
stop();
|
||||
|
||||
setTimeout(function(){
|
||||
jQuery('#foo').ajaxStart(function(){
|
||||
ok( true, "ajaxStart" );
|
||||
}).ajaxStop(function(){
|
||||
ok( true, "ajaxStop" );
|
||||
start();
|
||||
}).ajaxSend(function(){
|
||||
ok( true, "ajaxSend" );
|
||||
}).ajaxComplete(function(){
|
||||
ok( true, "ajaxComplete" );
|
||||
}).ajaxError(function(){
|
||||
ok( false, "ajaxError" );
|
||||
}).ajaxSuccess(function(){
|
||||
ok( true, "ajaxSuccess" );
|
||||
});
|
||||
jQuery('#foo').ajaxStart(function(){
|
||||
ok( true, "ajaxStart" );
|
||||
}).ajaxStop(function(){
|
||||
ok( true, "ajaxStop" );
|
||||
start();
|
||||
}).ajaxSend(function(){
|
||||
ok( true, "ajaxSend" );
|
||||
}).ajaxComplete(function(){
|
||||
ok( true, "ajaxComplete" );
|
||||
}).ajaxError(function(){
|
||||
ok( false, "ajaxError" );
|
||||
}).ajaxSuccess(function(){
|
||||
ok( true, "ajaxSuccess" );
|
||||
});
|
||||
|
||||
jQuery.ajax({
|
||||
url: url("data/name.html"),
|
||||
beforeSend: function(){ ok(true, "beforeSend"); },
|
||||
success: function(){ ok(true, "success"); },
|
||||
error: function(){ ok(false, "error"); },
|
||||
complete: function(){ ok(true, "complete"); }
|
||||
});
|
||||
}, 13);
|
||||
jQuery.ajax({
|
||||
url: url("data/name.html"),
|
||||
beforeSend: function(){ ok(true, "beforeSend"); },
|
||||
success: function(){ ok(true, "success"); },
|
||||
error: function(){ ok(false, "error"); },
|
||||
complete: function(){ ok(true, "complete"); }
|
||||
});
|
||||
}, 13);
|
||||
});
|
||||
|
||||
test("jQuery.ajax() - error callbacks", function() {
|
||||
expect( 8 );
|
||||
stop();
|
||||
expect( 8 );
|
||||
stop();
|
||||
|
||||
jQuery('#foo').ajaxStart(function(){
|
||||
ok( true, "ajaxStart" );
|
||||
}).ajaxStop(function(){
|
||||
ok( true, "ajaxStop" );
|
||||
start();
|
||||
}).ajaxSend(function(){
|
||||
ok( true, "ajaxSend" );
|
||||
}).ajaxComplete(function(){
|
||||
ok( true, "ajaxComplete" );
|
||||
}).ajaxError(function(){
|
||||
ok( true, "ajaxError" );
|
||||
}).ajaxSuccess(function(){
|
||||
ok( false, "ajaxSuccess" );
|
||||
});
|
||||
jQuery('#foo').ajaxStart(function(){
|
||||
ok( true, "ajaxStart" );
|
||||
}).ajaxStop(function(){
|
||||
ok( true, "ajaxStop" );
|
||||
start();
|
||||
}).ajaxSend(function(){
|
||||
ok( true, "ajaxSend" );
|
||||
}).ajaxComplete(function(){
|
||||
ok( true, "ajaxComplete" );
|
||||
}).ajaxError(function(){
|
||||
ok( true, "ajaxError" );
|
||||
}).ajaxSuccess(function(){
|
||||
ok( false, "ajaxSuccess" );
|
||||
});
|
||||
|
||||
jQuery.ajaxSetup({ timeout: 500 });
|
||||
jQuery.ajaxSetup({ timeout: 500 });
|
||||
|
||||
jQuery.ajax({
|
||||
url: url("data/name.php?wait=5"),
|
||||
beforeSend: function(){ ok(true, "beforeSend"); },
|
||||
success: function(){ ok(false, "success"); },
|
||||
error: function(){ ok(true, "error"); },
|
||||
complete: function(){ ok(true, "complete"); }
|
||||
});
|
||||
jQuery.ajax({
|
||||
url: url("data/name.php?wait=5"),
|
||||
beforeSend: function(){ ok(true, "beforeSend"); },
|
||||
success: function(){ ok(false, "success"); },
|
||||
error: function(){ ok(true, "error"); },
|
||||
complete: function(){ ok(true, "complete"); }
|
||||
});
|
||||
});
|
||||
|
||||
test("jQuery.ajax() - disabled globals", function() {
|
||||
|
|
@ -97,7 +97,7 @@ test("jQuery.ajax() - disabled globals", function() {
|
|||
complete: function(){
|
||||
ok(true, "complete");
|
||||
setTimeout(function(){ start(); }, 13);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -108,10 +108,10 @@ test("jQuery.ajax - xml: non-namespace elements inside namespaced elements", fun
|
|||
url: url("data/with_fries.xml"),
|
||||
dataType: "xml",
|
||||
success: function(resp) {
|
||||
equals( jQuery("properties", resp).length, 1, 'properties in responseXML' );
|
||||
equals( jQuery("jsconf", resp).length, 1, 'jsconf in responseXML' );
|
||||
equals( jQuery("thing", resp).length, 2, 'things in responseXML' );
|
||||
start();
|
||||
equals( jQuery("properties", resp).length, 1, 'properties in responseXML' );
|
||||
equals( jQuery("jsconf", resp).length, 1, 'jsconf in responseXML' );
|
||||
equals( jQuery("thing", resp).length, 2, 'things in responseXML' );
|
||||
start();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -175,9 +175,9 @@ test("jQuery.ajax - dataType html", function() {
|
|||
dataType: "html",
|
||||
url: url("data/test.html"),
|
||||
success: function(data) {
|
||||
jQuery("#ap").html(data);
|
||||
ok( data.match(/^html text/), 'Check content for datatype html' );
|
||||
setTimeout(verifyEvaluation, 600);
|
||||
jQuery("#ap").html(data);
|
||||
ok( data.match(/^html text/), 'Check content for datatype html' );
|
||||
setTimeout(verifyEvaluation, 600);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -275,13 +275,13 @@ test("ajax cache", function () {
|
|||
|
||||
jQuery("#firstp").bind("ajaxSuccess", function (e, xml, s) {
|
||||
var re = /_=(.*?)(&|$)/g;
|
||||
var oldOne = null;
|
||||
var oldOne = null;
|
||||
for (var i = 0; i < 6; i++) {
|
||||
var ret = re.exec(s.url);
|
||||
var ret = re.exec(s.url);
|
||||
if (!ret) {
|
||||
break;
|
||||
}
|
||||
oldOne = ret[1];
|
||||
oldOne = ret[1];
|
||||
}
|
||||
equals(i, 1, "Test to make sure only one 'no-cache' parameter is there");
|
||||
ok(oldOne != "tobereplaced555", "Test to be sure parameter (if it was there) was replaced");
|
||||
|
|
@ -301,19 +301,19 @@ test("global ajaxSettings", function() {
|
|||
expect(2);
|
||||
|
||||
var tmp = jQuery.extend({}, jQuery.ajaxSettings);
|
||||
var orig = { url: "data/with_fries.xml" };
|
||||
var orig = { url: "data/with_fries.xml" };
|
||||
var t;
|
||||
|
||||
jQuery.ajaxSetup({ data: {foo: 'bar', bar: 'BAR'} });
|
||||
|
||||
t = jQuery.extend({}, orig);
|
||||
t = jQuery.extend({}, orig);
|
||||
t.data = {};
|
||||
jQuery.ajax(t);
|
||||
jQuery.ajax(t);
|
||||
ok( t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending {}" );
|
||||
|
||||
t = jQuery.extend({}, orig);
|
||||
t = jQuery.extend({}, orig);
|
||||
t.data = { zoo: 'a', ping: 'b' };
|
||||
jQuery.ajax(t);
|
||||
jQuery.ajax(t);
|
||||
ok( t.url.indexOf('ping') > -1 && t.url.indexOf('zoo') > -1 && t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending { zoo: 'a', ping: 'b' }" );
|
||||
|
||||
jQuery.ajaxSettings = tmp;
|
||||
|
|
@ -405,7 +405,7 @@ test("load(String, String, Function)", function() {
|
|||
jQuery('<div />').load(url('data/params_html.php'), 'foo=3&bar=ok', function() {
|
||||
var $get = jQuery(this).find('#get');
|
||||
equals( $get.find('#foo').text(), '3', 'Check if a string of data is passed correctly');
|
||||
equals( $get.find('#bar').text(), 'ok', 'Check if a of data is passed correctly');
|
||||
equals( $get.find('#bar').text(), 'ok', 'Check if a of data is passed correctly');
|
||||
start();
|
||||
});
|
||||
});
|
||||
|
|
@ -709,16 +709,16 @@ test("jQuery.post(String, Hash, Function) - simple with xml", function() {
|
|||
|
||||
jQuery.post(url("data/name.php"), {xml: "5-2"}, function(xml){
|
||||
jQuery('math', xml).each(function() {
|
||||
equals( jQuery('calculation', this).text(), '5-2', 'Check for XML' );
|
||||
equals( jQuery('result', this).text(), '3', 'Check for XML' );
|
||||
equals( jQuery('calculation', this).text(), '5-2', 'Check for XML' );
|
||||
equals( jQuery('result', this).text(), '3', 'Check for XML' );
|
||||
});
|
||||
if ( ++done === 2 ) start();
|
||||
});
|
||||
|
||||
jQuery.post(url("data/name.php?xml=5-2"), {}, function(xml){
|
||||
jQuery('math', xml).each(function() {
|
||||
equals( jQuery('calculation', this).text(), '5-2', 'Check for XML' );
|
||||
equals( jQuery('result', this).text(), '3', 'Check for XML' );
|
||||
equals( jQuery('calculation', this).text(), '5-2', 'Check for XML' );
|
||||
equals( jQuery('result', this).text(), '3', 'Check for XML' );
|
||||
});
|
||||
if ( ++done === 2 ) start();
|
||||
});
|
||||
|
|
@ -735,7 +735,7 @@ test("jQuery.ajaxSetup({timeout: Number}) - with global timeout", function() {
|
|||
passed++;
|
||||
if ( passed == 2 ) {
|
||||
ok( true, 'Check local and global callbacks after timeout' );
|
||||
jQuery('#main').unbind("ajaxError");
|
||||
jQuery('#main').unbind("ajaxError");
|
||||
start();
|
||||
}
|
||||
};
|
||||
|
|
@ -771,8 +771,8 @@ test("jQuery.ajaxSetup({timeout: Number}) with localtimeout", function() {
|
|||
start();
|
||||
},
|
||||
success: function() {
|
||||
ok( true, 'Check for local timeout' );
|
||||
start();
|
||||
ok( true, 'Check for local timeout' );
|
||||
start();
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -787,8 +787,8 @@ test("jQuery.ajax - simple get", function() {
|
|||
type: "GET",
|
||||
url: url("data/name.php?name=foo"),
|
||||
success: function(msg){
|
||||
equals( msg, 'bar', 'Check for GET' );
|
||||
start();
|
||||
equals( msg, 'bar', 'Check for GET' );
|
||||
start();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -801,8 +801,8 @@ test("jQuery.ajax - simple post", function() {
|
|||
url: url("data/name.php"),
|
||||
data: "name=peter",
|
||||
success: function(msg){
|
||||
equals( msg, 'pan', 'Check for POST' );
|
||||
start();
|
||||
equals( msg, 'pan', 'Check for POST' );
|
||||
start();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -813,7 +813,7 @@ test("ajaxSetup()", function() {
|
|||
jQuery.ajaxSetup({
|
||||
url: url("data/name.php?name=foo"),
|
||||
success: function(msg){
|
||||
equals( msg, 'bar', 'Check for GET' );
|
||||
equals( msg, 'bar', 'Check for GET' );
|
||||
start();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue