diff options
| author | Vojta Jina | 2011-11-04 17:15:03 -0700 |
|---|---|---|
| committer | Igor Minar | 2011-11-30 11:17:25 -0500 |
| commit | b9707d910e8dd354a2f684588c1e7d83c5f88b8a (patch) | |
| tree | 2c6d1d375bad6785c16c1e4c00b60ad826c2c888 /src/service/http.js | |
| parent | 5bbd64ac65a89f43ce30a948fc0e0f5442cacb1e (diff) | |
| download | angular.js-b9707d910e8dd354a2f684588c1e7d83c5f88b8a.tar.bz2 | |
style(): get rid off some jsl warnings
Diffstat (limited to 'src/service/http.js')
| -rw-r--r-- | src/service/http.js | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/service/http.js b/src/service/http.js index d7ad9dde..049dbd50 100644 --- a/src/service/http.js +++ b/src/service/http.js @@ -61,13 +61,17 @@ function transform(data, fns, param) { * @description */ function $HttpProvider() { + var JSON_START = /^\s*[\[\{]/, + JSON_END = /[\}\]]\s*$/, + PROTECTION_PREFIX = /^\)\]\}',?\n/; + var $config = this.defaults = { // transform in-coming reponse data transformResponse: function(data) { if (isString(data)) { // strip json vulnerability protection prefix - data = data.replace(/^\)\]\}',?\n/, ''); - if (/^\s*[\[\{]/.test(data) && /[\}\]]\s*$/.test(data)) + data = data.replace(PROTECTION_PREFIX, ''); + if (JSON_START.test(data) && JSON_END.test(data)) data = fromJson(data, true); } return data; @@ -313,9 +317,9 @@ function $HttpProvider() { */ function headers(name) { if (name) { - return parsedHeaders - ? parsedHeaders[lowercase(name)] || null - : rawRequest.getResponseHeader(name); + return parsedHeaders ? + parsedHeaders[lowercase(name)] || null : + rawRequest.getResponseHeader(name); } parsedHeaders = parsedHeaders || parseHeaders(rawRequest.getAllResponseHeaders()); |
