git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change embedded regexp to a variable (for #6876).
[jquery.git]
/
src
/
ajax.js
diff --git
a/src/ajax.js
b/src/ajax.js
index
eae20e4
..
d570fcc
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-11,6
+11,7
@@
var r20 = /%20/g,
rselectTextarea = /^(?:select|textarea)/i,
rts = /([?&])_=[^&]*/,
rurl = /^(\w+:)?\/\/([^\/?#:]+)(?::(\d+))?/,
rselectTextarea = /^(?:select|textarea)/i,
rts = /([?&])_=[^&]*/,
rurl = /^(\w+:)?\/\/([^\/?#:]+)(?::(\d+))?/,
+ rCRLF = /\r?\n/g,
// Slice function
sliceFunc = Array.prototype.slice,
// Slice function
sliceFunc = Array.prototype.slice,
@@
-107,9
+108,9
@@
jQuery.fn.extend({
null :
jQuery.isArray(val) ?
jQuery.map( val, function(val, i){
null :
jQuery.isArray(val) ?
jQuery.map( val, function(val, i){
- return {name: elem.name, value: val.replace(/\r?\n/g, "\r\n")};
+ return { name: elem.name, value: val.replace(rCRLF, "\r\n") };
}) :
}) :
- {name: elem.name, value: val.replace(/\r?\n/g, "\r\n")};
+ { name: elem.name, value: val.replace(rCRLF, "\r\n") };
}).get();
}
});
}).get();
}
});
@@
-536,7
+537,7
@@
jQuery.extend({
}
// Get transport
}
// Get transport
- transport = jQuery.ajax.prefilter( s ).transport( s );
+ transport = jQuery.ajax.prefilter( s , options ).transport( s );
// Watch for a new set of requests
if ( s.global && jQuery.active++ === 0 ) {
// Watch for a new set of requests
if ( s.global && jQuery.active++ === 0 ) {