diff options
| author | Caitlin Potter | 2014-02-04 19:09:53 -0500 |
|---|---|---|
| committer | Caitlin Potter | 2014-02-04 19:09:53 -0500 |
| commit | 058842ad04009c306f9ac1403f3b8e354af523bd (patch) | |
| tree | 5d610c8d78bded4149db0296432a9a8eab6ea286 /src | |
| parent | 431bad01835f0294eb159d5b08101d5904828147 (diff) | |
| download | angular.js-058842ad04009c306f9ac1403f3b8e354af523bd.tar.bz2 | |
revert: "fix($http): ignore xhr.responseType setter exception if value is "json""
This reverts commit 431bad01835f0294eb159d5b08101d5904828147.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ng/httpBackend.js | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/ng/httpBackend.js b/src/ng/httpBackend.js index 842fd0cf..11e1b999 100644 --- a/src/ng/httpBackend.js +++ b/src/ng/httpBackend.js @@ -106,21 +106,8 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc xhr.withCredentials = true; } - if (responseType && isString(xhr.responseType)) { - try { - xhr.responseType = responseType; - } catch (e) { - // WebKit added support for the json responseType value on 09/03/2013 - // https://bugs.webkit.org/show_bug.cgi?id=73648. Versions of Safari prior to 7 are - // known to throw when setting the value "json" as the response type. Other older - // browsers implementing the responseType - // - // The json response type can be ignored if not supported, because JSON payloads are - // parsed on the client-side regardless. - if (responseType !== 'json') { - throw e; - } - } + if (responseType) { + xhr.responseType = responseType; } xhr.send(post || null); |
