github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-01 17:14:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ajax: Remove jsonp callbacks through "jQuery#removeProp" method

Browse Source 
Fixes gh-2323
Closes gh-2464
Ref a2ae215d99
This commit is contained in:
Oleg Gaidarenko
2015-07-10 20:58:43 +03:00
parent 1682d36be2
commit 3d850edb13
2 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
test/unit/ajax.js
View File

@@ -1,5 +1,11 @@
var isIE8 = /msie 8\.0/i.test( window.navigator.userAgent );
module( "ajax", {
setup: function() {
if ( !isIE8 ) {
return;
}
var jsonpCallback = this.jsonpCallback = jQuery.ajaxSettings.jsonpCallback;
jQuery.ajaxSettings.jsonpCallback = function() {
var callback = jsonpCallback.apply( this, arguments );
@@ -737,7 +743,7 @@ module( "ajax", {
}
]);
ajaxTest( "jQuery.ajax() - JSONP - Explicit callback param" + label, 9, {
ajaxTest( "jQuery.ajax() - JSONP - Explicit callback param" + label, 10, {
setup: function() {
Globals.register("functionToCleanUp");
Globals.register("XXX");
@@ -760,6 +766,11 @@ module( "ajax", {
crossDomain: crossDomain,
jsonpCallback: "jsonpResults",
success: function( data ) {
strictEqual(
typeof window[ "jsonpResults" ],
"function",
"should not rewrite original function"
);
ok( data.data, "JSON results returned (GET, custom callback name)" );
}
}, {
@@ -1372,16 +1383,34 @@ module( "ajax", {
]);
jQuery.each( [ " - Same Domain", " - Cross Domain" ], function( crossDomain, label ) {
ajaxTest( "#8205 - jQuery.ajax() - JSONP - re-use callbacks name" + label, 2, {
ajaxTest( "#8205 - jQuery.ajax() - JSONP - re-use callbacks name" + label, 4, {
url: "data/jsonp.php",
dataType: "jsonp",
crossDomain: crossDomain,
beforeSend: function( jqXHR, s ) {
s.callback = s.jsonpCallback;
ok( this.callback in window, "JSONP callback name is in the window" );
},
success: function() {
var previous = this;
strictEqual( previous.jsonpCallback, undefined, "jsonpCallback option is set back to default in callbacks" );
strictEqual(
previous.jsonpCallback,
undefined,
"jsonpCallback option is set back to default in callbacks"
);
if ( isIE8 ) {
ok( true, "IE8 can't remove property from the window" );
} else {
ok(
!( this.callback in window ),
"JSONP callback name was removed from the window"
);
}
jQuery.ajax({
url: "data/jsonp.php",
dataType: "jsonp",