mirrors/axios
2
0
Fork 0
mirror of https://github.com/tenrok/axios.git synced 2026-06-05 16:42:32 +03:00
Code Activity

Resolving merge conflicts

Browse Source
This commit is contained in:
Matt Zabriskie
2016-03-05 23:56:02 -07:00
parent 84755d1325 261e41644d
commit 5fc59a65aa
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adapters/xhr.js
+9
View File
@@ -151,6 +151,15 @@ module.exports = function xhrAdapter(resolve, reject, config) {
requestData = new DataView(requestData);
}
// Handle progress if needed
if (config.progress) {
if (config.method === 'post' || config.method === 'put') {
request.upload.addEventListener('progress', config.progress);
} else if (config.method === 'get') {
request.addEventListener('progress', config.progress);
}
}
// Clean up request
requestData = (requestData === undefined)
? null