deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix global event triggering that i broke in r6323

Browse source
This commit is contained in:
Brandon Aaron 2009-05-01 00:59:27 +00:00
parent 96fd5f18d4
commit cbda6c541b
2 changed files with 127 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/event.js
View file

@ -214,11 +214,11 @@ jQuery.event = {
event.stopPropagation(); event.stopPropagation();
// Only trigger if we've ever bound an event for it // Only trigger if we've ever bound an event for it
if ( this.global[ type ] ) { if ( this.global[ type ] ) {
for ( var cached in jQuery.cache ) { jQuery.each( jQuery.cache, function() {
if ( cached.events && cached.events[ type ] ) { if ( this.events && this.events[type] ) {
this.trigger( event, data, cached.handle.elem ); jQuery.event.trigger( event, data, this.handle.elem );
} }
} });
} }
} }

150
test/unit/ajax.js
View file

@ -15,59 +15,59 @@ test("jQuery.ajax() - success callbacks", function() {
stop(); stop();
setTimeout(function(){ setTimeout(function(){
jQuery('#foo').ajaxStart(function(){ jQuery('#foo').ajaxStart(function(){
ok( true, "ajaxStart" ); ok( true, "ajaxStart" );
}).ajaxStop(function(){ }).ajaxStop(function(){
ok( true, "ajaxStop" ); ok( true, "ajaxStop" );
start(); start();
}).ajaxSend(function(){ }).ajaxSend(function(){
ok( true, "ajaxSend" ); ok( true, "ajaxSend" );
}).ajaxComplete(function(){ }).ajaxComplete(function(){
ok( true, "ajaxComplete" ); ok( true, "ajaxComplete" );
}).ajaxError(function(){ }).ajaxError(function(){
ok( false, "ajaxError" ); ok( false, "ajaxError" );
}).ajaxSuccess(function(){ }).ajaxSuccess(function(){
ok( true, "ajaxSuccess" ); ok( true, "ajaxSuccess" );
}); });
jQuery.ajax({ jQuery.ajax({
url: url("data/name.html"), url: url("data/name.html"),
beforeSend: function(){ ok(true, "beforeSend"); }, beforeSend: function(){ ok(true, "beforeSend"); },
success: function(){ ok(true, "success"); }, success: function(){ ok(true, "success"); },
error: function(){ ok(false, "error"); }, error: function(){ ok(false, "error"); },
complete: function(){ ok(true, "complete"); } complete: function(){ ok(true, "complete"); }
}); });
}, 13); }, 13);
}); });
test("jQuery.ajax() - error callbacks", function() { test("jQuery.ajax() - error callbacks", function() {
expect( 8 ); expect( 8 );
stop(); stop();
jQuery('#foo').ajaxStart(function(){ jQuery('#foo').ajaxStart(function(){
ok( true, "ajaxStart" ); ok( true, "ajaxStart" );
}).ajaxStop(function(){ }).ajaxStop(function(){
ok( true, "ajaxStop" ); ok( true, "ajaxStop" );
start(); start();
}).ajaxSend(function(){ }).ajaxSend(function(){
ok( true, "ajaxSend" ); ok( true, "ajaxSend" );
}).ajaxComplete(function(){ }).ajaxComplete(function(){
ok( true, "ajaxComplete" ); ok( true, "ajaxComplete" );
}).ajaxError(function(){ }).ajaxError(function(){
ok( true, "ajaxError" ); ok( true, "ajaxError" );
}).ajaxSuccess(function(){ }).ajaxSuccess(function(){
ok( false, "ajaxSuccess" ); ok( false, "ajaxSuccess" );
}); });
jQuery.ajaxSetup({ timeout: 500 }); jQuery.ajaxSetup({ timeout: 500 });
jQuery.ajax({ jQuery.ajax({
url: url("data/name.php?wait=5"), url: url("data/name.php?wait=5"),
beforeSend: function(){ ok(true, "beforeSend"); }, beforeSend: function(){ ok(true, "beforeSend"); },
success: function(){ ok(false, "success"); }, success: function(){ ok(false, "success"); },
error: function(){ ok(true, "error"); }, error: function(){ ok(true, "error"); },
complete: function(){ ok(true, "complete"); } complete: function(){ ok(true, "complete"); }
}); });
}); });
test("jQuery.ajax() - disabled globals", function() { test("jQuery.ajax() - disabled globals", function() {
@ -97,7 +97,7 @@ test("jQuery.ajax() - disabled globals", function() {
complete: function(){ complete: function(){
ok(true, "complete"); ok(true, "complete");
setTimeout(function(){ start(); }, 13); 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"), url: url("data/with_fries.xml"),
dataType: "xml", dataType: "xml",
success: function(resp) { success: function(resp) {
equals( jQuery("properties", resp).length, 1, 'properties in responseXML' ); equals( jQuery("properties", resp).length, 1, 'properties in responseXML' );
equals( jQuery("jsconf", resp).length, 1, 'jsconf in responseXML' ); equals( jQuery("jsconf", resp).length, 1, 'jsconf in responseXML' );
equals( jQuery("thing", resp).length, 2, 'things in responseXML' ); equals( jQuery("thing", resp).length, 2, 'things in responseXML' );
start(); start();
} }
}); });
}); });
@ -175,9 +175,9 @@ test("jQuery.ajax - dataType html", function() {
dataType: "html", dataType: "html",
url: url("data/test.html"), url: url("data/test.html"),
success: function(data) { success: function(data) {
jQuery("#ap").html(data); jQuery("#ap").html(data);
ok( data.match(/^html text/), 'Check content for datatype html' ); ok( data.match(/^html text/), 'Check content for datatype html' );
setTimeout(verifyEvaluation, 600); setTimeout(verifyEvaluation, 600);
} }
}); });
}); });
@ -275,13 +275,13 @@ test("ajax cache", function () {
jQuery("#firstp").bind("ajaxSuccess", function (e, xml, s) { jQuery("#firstp").bind("ajaxSuccess", function (e, xml, s) {
var re = /_=(.*?)(&|$)/g; var re = /_=(.*?)(&|$)/g;
var oldOne = null; var oldOne = null;
for (var i = 0; i < 6; i++) { for (var i = 0; i < 6; i++) {
var ret = re.exec(s.url); var ret = re.exec(s.url);
if (!ret) { if (!ret) {
break; break;
} }
oldOne = ret[1]; oldOne = ret[1];
} }
equals(i, 1, "Test to make sure only one 'no-cache' parameter is there"); 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"); ok(oldOne != "tobereplaced555", "Test to be sure parameter (if it was there) was replaced");
@ -301,19 +301,19 @@ test("global ajaxSettings", function() {
expect(2); expect(2);
var tmp = jQuery.extend({}, jQuery.ajaxSettings); var tmp = jQuery.extend({}, jQuery.ajaxSettings);
var orig = { url: "data/with_fries.xml" }; var orig = { url: "data/with_fries.xml" };
var t; var t;
jQuery.ajaxSetup({ data: {foo: 'bar', bar: 'BAR'} }); jQuery.ajaxSetup({ data: {foo: 'bar', bar: 'BAR'} });
t = jQuery.extend({}, orig); t = jQuery.extend({}, orig);
t.data = {}; t.data = {};
jQuery.ajax(t); jQuery.ajax(t);
ok( t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending {}" ); 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' }; 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' }" ); 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; 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() { jQuery('<div />').load(url('data/params_html.php'), 'foo=3&bar=ok', function() {
var $get = jQuery(this).find('#get'); var $get = jQuery(this).find('#get');
equals( $get.find('#foo').text(), '3', 'Check if a string of data is passed correctly'); 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(); 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.post(url("data/name.php"), {xml: "5-2"}, function(xml){
jQuery('math', xml).each(function() { jQuery('math', xml).each(function() {
equals( jQuery('calculation', this).text(), '5-2', 'Check for XML' ); equals( jQuery('calculation', this).text(), '5-2', 'Check for XML' );
equals( jQuery('result', this).text(), '3', 'Check for XML' ); equals( jQuery('result', this).text(), '3', 'Check for XML' );
}); });
if ( ++done === 2 ) start(); if ( ++done === 2 ) start();
}); });
jQuery.post(url("data/name.php?xml=5-2"), {}, function(xml){ jQuery.post(url("data/name.php?xml=5-2"), {}, function(xml){
jQuery('math', xml).each(function() { jQuery('math', xml).each(function() {
equals( jQuery('calculation', this).text(), '5-2', 'Check for XML' ); equals( jQuery('calculation', this).text(), '5-2', 'Check for XML' );
equals( jQuery('result', this).text(), '3', 'Check for XML' ); equals( jQuery('result', this).text(), '3', 'Check for XML' );
}); });
if ( ++done === 2 ) start(); if ( ++done === 2 ) start();
}); });
@ -735,7 +735,7 @@ test("jQuery.ajaxSetup({timeout: Number}) - with global timeout", function() {
passed++; passed++;
if ( passed == 2 ) { if ( passed == 2 ) {
ok( true, 'Check local and global callbacks after timeout' ); ok( true, 'Check local and global callbacks after timeout' );
jQuery('#main').unbind("ajaxError"); jQuery('#main').unbind("ajaxError");
start(); start();
} }
}; };
@ -771,8 +771,8 @@ test("jQuery.ajaxSetup({timeout: Number}) with localtimeout", function() {
start(); start();
}, },
success: function() { success: function() {
ok( true, 'Check for local timeout' ); ok( true, 'Check for local timeout' );
start(); start();
} }
}); });
@ -787,8 +787,8 @@ test("jQuery.ajax - simple get", function() {
type: "GET", type: "GET",
url: url("data/name.php?name=foo"), url: url("data/name.php?name=foo"),
success: function(msg){ success: function(msg){
equals( msg, 'bar', 'Check for GET' ); equals( msg, 'bar', 'Check for GET' );
start(); start();
} }
}); });
}); });
@ -801,8 +801,8 @@ test("jQuery.ajax - simple post", function() {
url: url("data/name.php"), url: url("data/name.php"),
data: "name=peter", data: "name=peter",
success: function(msg){ success: function(msg){
equals( msg, 'pan', 'Check for POST' ); equals( msg, 'pan', 'Check for POST' );
start(); start();
} }
}); });
}); });
@ -813,7 +813,7 @@ test("ajaxSetup()", function() {
jQuery.ajaxSetup({ jQuery.ajaxSetup({
url: url("data/name.php?name=foo"), url: url("data/name.php?name=foo"),
success: function(msg){ success: function(msg){
equals( msg, 'bar', 'Check for GET' ); equals( msg, 'bar', 'Check for GET' );
start(); start();
} }
}); });