From 431bad01835f0294eb159d5b08101d5904828147 Mon Sep 17 00:00:00 2001 From: Caitlin Potter Date: Tue, 4 Feb 2014 18:34:23 -0500 Subject: [PATCH] fix($http): ignore xhr.responseType setter exception if value is "json" 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. Other browsers with infrequent update cycles may also be affected. The json responseType value can be ignored if not supported, because JSON payloads are parsed on the client-side regardless. Closes #6115 Closes #6122 --- src/ng/httpBackend.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ng/httpBackend.js b/src/ng/httpBackend.js index 11e1b999439c..842fd0cf5a73 100644 --- a/src/ng/httpBackend.js +++ b/src/ng/httpBackend.js @@ -106,8 +106,21 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc xhr.withCredentials = true; } - if (responseType) { - xhr.responseType = responseType; + 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; + } + } } xhr.send(post || null);