add uploadProgress, downloadProgress callbacks

Author: Steffan

docs/http.md

@@ -51,9 +51,10 @@ params | `Object` | Parameters object to be sent as URL parameters
 method | `string` | HTTP method (e.g. GET, POST, ...)
 responseType | `string` | Type of the response body (e.g. text, blob, json, ...)
 timeout | `number` | Request timeout in milliseconds (`0` means no timeout)
-before | `function(request)` | Callback function to modify the request options before it is sent
-progress | `function(event)` | Callback function to handle the [ProgressEvent](https://developer.mozilla.org/en-US/docs/Web/API/ProgressEvent) of uploads
 credentials | `boolean` | Indicates whether or not cross-site Access-Control requests should be made using credentials
+before | `function(request)` | Callback function to modify the request options before it is sent
+uploadProgress | `function(event)` | Callback function to handle the [ProgressEvent](https://developer.mozilla.org/en-US/docs/Web/API/ProgressEvent) of uploads
+downloadProgress | `function(event)` | Callback function to handle the [ProgressEvent](https://developer.mozilla.org/en-US/docs/Web/API/ProgressEvent) of downloads
 emulateHTTP | `boolean` | Send PUT, PATCH and DELETE requests with a HTTP POST and set the `X-HTTP-Method-Override` header
 emulateJSON | `boolean` | Send request body as `application/x-www-form-urlencoded` content type
 

package.json

@@ -41,7 +41,7 @@
     "eslint": "^4.17.0",
     "generate-release": "^0.14.0",
     "jasmine": "^3.0.0",
-    "jasmine-core": "^2.99.1",
+    "jasmine-core": "^3.1.0",
     "jest": "^22.2.2",
     "karma": "^2.0.0",
     "karma-chrome-launcher": "^2.2.0",

src/http/client/xhr.js

@@ -3,7 +3,7 @@
  */
 
 import Promise from '../../promise';
-import {each, trim} from '../../util';
+import {each, trim, isFunction} from '../../util';
 
 export default function (request) {
     return new Promise(resolve => {
@@ -25,14 +25,6 @@ export default function (request) {
 
         request.abort = () => xhr.abort();
 
-        if (request.progress) {
-            if (request.method === 'GET') {
-                xhr.addEventListener('progress', request.progress);
-            } else if (/^(POST|PUT)$/i.test(request.method)) {
-                xhr.upload.addEventListener('progress', request.progress);
-            }
-        }
-
         xhr.open(request.method, request.getUrl(), true);
 
         if (request.timeout) {
@@ -51,6 +43,24 @@ export default function (request) {
             request.headers.set('X-Requested-With', 'XMLHttpRequest');
         }
 
+        // deprecated use downloadProgress
+        if (isFunction(request.progress) && request.method === 'GET') {
+            xhr.addEventListener('progress', request.progress);
+        }
+
+        if (isFunction(request.downloadProgress)) {
+            xhr.addEventListener('progress', request.downloadProgress);
+        }
+
+        // deprecated use uploadProgress
+        if (isFunction(request.progress) && /^(POST|PUT)$/i.test(request.method)) {
+            xhr.upload.addEventListener('progress', request.progress);
+        }
+
+        if (isFunction(request.uploadProgress) && xhr.upload) {
+            xhr.upload.addEventListener('progress', request.uploadProgress);
+        }
+
         request.headers.forEach((value, name) => {
             xhr.setRequestHeader(name, value);
         });

yarn.lock

@@ -3208,11 +3208,7 @@ isurl@^1.0.0-alpha5:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
 
-jasmine-core@^2.99.1:
-  version "2.99.1"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
-
-jasmine-core@~3.1.0:
+jasmine-core@^3.1.0, jasmine-core@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.1.0.tgz#a4785e135d5df65024dfc9224953df585bd2766c"