git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed the $(document).ready() code to try and solve some problems in Safari, Opera...
[jquery.git]
/
src
/
ajax.js
diff --git
a/src/ajax.js
b/src/ajax.js
index
a5a08ec
..
94e0228
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-151,7
+151,7
@@
jQuery.extend({
lastModified: {},
ajax: function( s ) {
lastModified: {},
ajax: function( s ) {
- var jsonp, jsre = /=(\?|%3F)/g, status, data;
+ var jsonp, jsre = /=\?(&|$)/g, status, data;
// Extend the settings, but re-extend 's' so that it can be
// checked again later (in the test suite, specifically)
// Extend the settings, but re-extend 's' so that it can be
// checked again later (in the test suite, specifically)
@@
-177,8
+177,8
@@
jQuery.extend({
// Replace the =? sequence both in the query string and the data
if ( s.data )
// Replace the =? sequence both in the query string and the data
if ( s.data )
- s.data = (s.data + "").replace(jsre, "=" + jsonp);
- s.url = s.url.replace(jsre, "=" + jsonp);
+ s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
+ s.url = s.url.replace(jsre, "=" + jsonp + "$1");
// We need to make sure
// that a JSONP style response is executed properly
// We need to make sure
// that a JSONP style response is executed properly
@@
-192,6
+192,8
@@
jQuery.extend({
// Garbage collect
window[ jsonp ] = undefined;
try{ delete window[ jsonp ]; } catch(e){}
// Garbage collect
window[ jsonp ] = undefined;
try{ delete window[ jsonp ]; } catch(e){}
+ if ( head )
+ head.removeChild( script );
};
}
};
}
@@
-224,6
+226,8
@@
jQuery.extend({
var head = document.getElementsByTagName("head")[0];
var script = document.createElement("script");
script.src = s.url;
var head = document.getElementsByTagName("head")[0];
var script = document.createElement("script");
script.src = s.url;
+ if (s.scriptCharset)
+ script.charset = s.scriptCharset;
// Handle Script loading
if ( !jsonp ) {
// Handle Script loading
if ( !jsonp ) {
@@
-244,7
+248,7
@@
jQuery.extend({
head.appendChild(script);
// We handle everything using the script element injection
head.appendChild(script);
// We handle everything using the script element injection
- return;
+ return undefined;
}
var requestDone = false;
}
var requestDone = false;
@@
-359,9
+363,6
@@
jQuery.extend({
// firefox 1.5 doesn't fire statechange for sync requests
if ( !s.async )
onreadystatechange();
// firefox 1.5 doesn't fire statechange for sync requests
if ( !s.async )
onreadystatechange();
-
- // return XMLHttpRequest to allow aborting the request etc.
- return xml;
function success(){
// If a local callback was specified, fire it and pass it the data
function success(){
// If a local callback was specified, fire it and pass it the data
@@
-386,6
+387,9
@@
jQuery.extend({
if ( s.global && ! --jQuery.active )
jQuery.event.trigger( "ajaxStop" );
}
if ( s.global && ! --jQuery.active )
jQuery.event.trigger( "ajaxStop" );
}
+
+ // return XMLHttpRequest to allow aborting the request etc.
+ return xml;
},
handleError: function( s, xml, status, e ) {
},
handleError: function( s, xml, status, e ) {