diff options
| author | Oleg Gaidarenko <markelog@gmail.com> | 2015-10-12 19:56:46 +0300 |
|---|---|---|
| committer | Oleg Gaidarenko <markelog@gmail.com> | 2015-10-12 22:38:15 +0300 |
| commit | 239169bb2ede6ea6287d82d1d13b0c354f451749 (patch) | |
| tree | 01acc8013b0446a96f05076657bfc5e3babcb0ba /src | |
| parent | cb087ce41daa5db4c8db10e586bdc141f953d93d (diff) | |
| download | jquery-239169bb2ede6ea6287d82d1d13b0c354f451749.tar.gz jquery-239169bb2ede6ea6287d82d1d13b0c354f451749.zip | |
Ajax: improve content-type detection
Fixes gh-2584
Closes gh-2643
Diffstat (limited to 'src')
| -rw-r--r-- | src/ajax.js | 6 | ||||
| -rw-r--r-- | src/ajax/script.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ajax.js b/src/ajax.js index 157934ef1..efc413650 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -322,9 +322,9 @@ jQuery.extend( { }, contents: { - xml: /xml/, - html: /html/, - json: /json/ + xml: /\bxml\b/, + html: /\bhtml/, + json: /\bjson\b/ }, responseFields: { diff --git a/src/ajax/script.js b/src/ajax/script.js index 3978ba46c..485ba397b 100644 --- a/src/ajax/script.js +++ b/src/ajax/script.js @@ -18,7 +18,7 @@ jQuery.ajaxSetup( { "application/ecmascript, application/x-ecmascript" }, contents: { - script: /(?:java|ecma)script/ + script: /\b(?:java|ecma)script\b/ }, converters: { "text script": function( text ) { |