From a63e7cd8ca20b613db4a4b11b664ad67ecc997c2 Mon Sep 17 00:00:00 2001 From: Michael Bradley Date: Fri, 26 Feb 2016 08:55:54 -0800 Subject: [PATCH 1/3] Fix for https://github.com/mzabriskie/axios/issues/248 undefined is not valid JSON, make the value null instead. JSON.parse(undefined) will throw an exception while JSON.parse(null) is acceptable. http://stackoverflow.com/a/14946821/5012948 --- lib/adapters/xhr.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js index c930f2e..6c02294 100644 --- a/lib/adapters/xhr.js +++ b/lib/adapters/xhr.js @@ -125,6 +125,9 @@ module.exports = function xhrAdapter(resolve, reject, config) { requestData = new DataView(requestData); } + // Clean up request + requestData = requestData === undefined ? null : requestData; + // Send the request request.send(requestData); }; From 68a45b5e3e6c063018763774e43e7895b3000b07 Mon Sep 17 00:00:00 2001 From: Michael Bradley Date: Fri, 26 Feb 2016 08:59:40 -0800 Subject: [PATCH 2/3] use multi line ternary operator https://github.com/felixge/node-style-guide#use-multi-line-ternary-operator --- lib/adapters/xhr.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js index 6c02294..11ad754 100644 --- a/lib/adapters/xhr.js +++ b/lib/adapters/xhr.js @@ -126,7 +126,9 @@ module.exports = function xhrAdapter(resolve, reject, config) { } // Clean up request - requestData = requestData === undefined ? null : requestData; + requestData = (requestData === undefined) + ? null + : requestData; // Send the request request.send(requestData); From 1c32e2ab8d0e65bdb9de40b945497f14f9c4de2f Mon Sep 17 00:00:00 2001 From: Michael Bradley Date: Fri, 26 Feb 2016 13:34:20 -0800 Subject: [PATCH 3/3] remove trailing spaces --- lib/adapters/xhr.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js index 11ad754..5432cce 100644 --- a/lib/adapters/xhr.js +++ b/lib/adapters/xhr.js @@ -127,9 +127,9 @@ module.exports = function xhrAdapter(resolve, reject, config) { // Clean up request requestData = (requestData === undefined) - ? null + ? null : requestData; - + // Send the request request.send(requestData); };