git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:jquery/jquery
[jquery.git]
/
src
/
ajax.js
diff --git
a/src/ajax.js
b/src/ajax.js
index
6a757eb
..
ff293da
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-208,12
+208,6
@@
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 ) {
- s.dataType = "jsonp";
- }
-
// Handle JSONP Parameter Callbacks
if ( s.dataType === "jsonp" ) {
if ( type === "GET" ) {
// Handle JSONP Parameter Callbacks
if ( s.dataType === "jsonp" ) {
if ( type === "GET" ) {
@@
-293,7
+287,7
@@
jQuery.extend({
// Matches an absolute URL, and saves the domain
var parts = rurl.exec( s.url ),
// Matches an absolute URL, and saves the domain
var parts = rurl.exec( s.url ),
- remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host);
+ remote = parts && (parts[1] && parts[1].toLowerCase() !== location.protocol || parts[2].toLowerCase() !== location.host);
// If we're requesting a remote document
// and trying to load JSON or Script with a GET
// If we're requesting a remote document
// and trying to load JSON or Script with a GET