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 'useragent'
[jquery.git]
/
src
/
ajax.js
diff --git
a/src/ajax.js
b/src/ajax.js
index
37fb75b
..
91519d2
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-175,12
+175,18
@@
jQuery.extend({
traditional: false,
*/
// Create the request object; Microsoft failed to properly
traditional: false,
*/
// Create the request object; Microsoft failed to properly
- // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
+ // implement the XMLHttpRequest in IE7 (can't request local files),
+ // so we use the ActiveXObject when it is available
// This function can be overriden by calling jQuery.ajaxSetup
xhr: function() {
// This function can be overriden by calling jQuery.ajaxSetup
xhr: function() {
- return window.ActiveXObject ?
- new ActiveXObject("Microsoft.XMLHTTP") :
- new XMLHttpRequest();
+ if ( window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ) {
+ return new window.XMLHttpRequest();
+
+ } else {
+ try {
+ return new window.ActiveXObject("Microsoft.XMLHTTP");
+ } catch(e) {}
+ }
},
accepts: {
xml: "application/xml, text/xml",
},
accepts: {
xml: "application/xml, text/xml",
@@
-325,6
+331,10
@@
jQuery.extend({
// Create the request object
var xhr = s.xhr();
// Create the request object
var xhr = s.xhr();
+ if ( !xhr ) {
+ return;
+ }
+
// Open the socket
// Passing null username, generates a login popup on Opera (#2865)
if ( s.username ) {
// Open the socket
// Passing null username, generates a login popup on Opera (#2865)
if ( s.username ) {
@@
-569,9
+579,11
@@
jQuery.extend({
// Get the JavaScript object, if JSON is used.
if ( type === "json" ) {
// Get the JavaScript object, if JSON is used.
if ( type === "json" ) {
- if ( typeof JSON === "object" && JSON.parse ) {
+ // Try to use the native JSON parser first
+ try {
data = JSON.parse( data );
data = JSON.parse( data );
- } else {
+
+ } catch(e) {
data = (new Function("return " + data))();
}
}
data = (new Function("return " + data))();
}
}