v0.7.0

Author: steffans

bower.json

@@ -2,7 +2,7 @@
   "name": "vue-resource",
   "main": "dist/vue-resource.js",
   "description": "A web request service for Vue.js",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "homepage": "https://github.com/vuejs/vue-resource",
   "license": "MIT",
   "ignore": [

dist/vue-resource.js

@@ -1,5 +1,5 @@
 /**
- * vue-resource v0.6.1
+ * vue-resource v0.7.0
  * https://github.com/vuejs/vue-resource
  * Released under the MIT License.
  */
@@ -715,6 +715,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    params: {},
 	    headers: {},
 	    xhr: null,
+	    upload: null,
 	    jsonp: 'callback',
 	    beforeSend: null,
 	    crossOrigin: null,
@@ -1157,14 +1158,6 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	        xhr.open(request.method, _.url(request), true);
 
-	        if (_.isPlainObject(request.xhr)) {
-	            _.extend(xhr, request.xhr);
-	        }
-
-	        _.each(request.headers || {}, function (value, header) {
-	            xhr.setRequestHeader(header, value);
-	        });
-
 	        handler = function (event) {
 
 	            response.data = xhr.responseText;
@@ -1175,9 +1168,24 @@ return /******/ (function(modules) { // webpackBootstrap
 	            resolve(response);
 	        };
 
+	        xhr.timeout = 0;
 	        xhr.onload = handler;
 	        xhr.onabort = handler;
 	        xhr.onerror = handler;
+	        xhr.ontimeout = function () {};
+	        xhr.onprogress = function () {};
+
+	        if (_.isPlainObject(request.xhr)) {
+	            _.extend(xhr, request.xhr);
+	        }
+
+	        if (_.isPlainObject(request.upload)) {
+	            _.extend(xhr.upload, request.upload);
+	        }
+
+	        _.each(request.headers || {}, function (value, header) {
+	            xhr.setRequestHeader(header, value);
+	        });
 
 	        xhr.send(request.data);
 	    });

dist/vue-resource.min.js

@@ -68,7 +68,8 @@ headers | `Object` | Headers object to be sent as HTTP request headers
 beforeSend | `function(request)` | Callback function to modify the request object before it is sent
 emulateHTTP | `boolean` | Send PUT, PATCH and DELETE requests with a HTTP POST and set the `X-HTTP-Method-Override` header
 emulateJSON | `boolean` | Send request data as `application/x-www-form-urlencoded` content type
-xhr | `Object` | Parameters object to be set on the native XHR object
+xhr | `Object` | Parameters object to be set on the [XHR](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest) object
+upload | `Object` | Parameters object to be set on the [XHR.upload](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/upload) property
 jsonp | `string` | Callback function name in a JSONP request
 timeout | `number` | Request timeout in milliseconds (`0` means no timeout)
 

docs/http.md

@@ -1,6 +1,6 @@
 {
   "name": "vue-resource",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "A web request service for Vue.js",
   "main": "src/index.js",
   "scripts": {