Commit
- Loading branch information
There are no files selected for viewing
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
|
@@ -208,6 +208,12 @@ jQuery.extend({ | ||
s.data = jQuery.param( s.data, s.traditional ); | s.data = jQuery.param( s.data, s.traditional ); | ||
} | } | ||
|
|
||
// If the jsonpCallback has been set, we can assume that dataType is jsonp | |||
// Ticket #5803 | |||
if ( s.jsonpCallback ) { | |||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
jeresig
Member
|
|||
s.dataType = "jsonp"; | |||
} | |||
|
|||
// Handle JSONP Parameter Callbacks | // Handle JSONP Parameter Callbacks | ||
if ( s.dataType === "jsonp" ) { | if ( s.dataType === "jsonp" ) { | ||
if ( type === "GET" ) { | if ( type === "GET" ) { | ||
|
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
|
@@ -32,6 +32,9 @@ jQuery.event = { | ||
|
|
||
if ( handler === false ) { | if ( handler === false ) { | ||
handler = returnFalse; | handler = returnFalse; | ||
} else if ( !handler ) { | |||
This comment has been minimized.
Sorry, something went wrong.
csnover
Member
|
|||
// Fixes bug #7229. Fix recommended by jdalton | |||
return; | |||
} | } | ||
|
|
||
var handleObjIn, handleObj; | var handleObjIn, handleObj; | ||
|
This is a very very risky commit for a maintenance release since it is an enhancement. Someone that prepares and re-uses a single object for their AJAX requests, changing only the dataType between jsonp/regular requests, may experience a regression here.