Merge branch 'release/1.0.3'

README.md

@@ -22,9 +22,9 @@ $ bower install vue-resource
 ```
 
 ### CDN
-Available on [jsdelivr](https://cdn.jsdelivr.net/vue.resource/1.0.2/vue-resource.min.js), [cdnjs](https://cdnjs.com/libraries/vue-resource) or [npmcdn](https://npmcdn.com/[email protected].2/dist/vue-resource.min.js).
+Available on [jsdelivr](https://cdn.jsdelivr.net/vue.resource/1.0.3/vue-resource.min.js), [cdnjs](https://cdnjs.com/libraries/vue-resource) or [unpkg](https://unpkg.com/[email protected].3/dist/vue-resource.min.js).
 ```html
-<script src="https://cdn.jsdelivr.net/vue.resource/1.0.2/vue-resource.min.js"></script>
+<script src="https://cdn.jsdelivr.net/vue.resource/1.0.3/vue-resource.min.js"></script>
 ```
 
 ## Example

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "vue-resource",
   "main": "dist/vue-resource.js",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "The HTTP client for Vue.js",
   "homepage": "https://github.com/vuejs/vue-resource",
   "license": "MIT",

dist/vue-resource.common.js

@@ -1,5 +1,5 @@
 /*!
- * vue-resource v1.0.2
+ * vue-resource v1.0.3
  * https://github.com/vuejs/vue-resource
  * Released under the MIT License.
  */
@@ -770,25 +770,30 @@ function xdrClient (request) {
     return new PromiseObj(function (resolve) {
 
         var xdr = new XDomainRequest(),
-            handler = function (event) {
+            handler = function (_ref) {
+            var type = _ref.type;
 
-            var response = request.respondWith(xdr.responseText, {
-                status: xdr.status,
-                statusText: xdr.statusText
-            });
 
-            resolve(response);
+            var status = 0;
+
+            if (type === 'load') {
+                status = 200;
+            } else if (type === 'error') {
+                status = 500;
+            }
+
+            resolve(request.respondWith(xdr.responseText, { status: status }));
         };
 
         request.abort = function () {
             return xdr.abort();
         };
 
-        xdr.open(request.method, request.getUrl(), true);
+        xdr.open(request.method, request.getUrl());
         xdr.timeout = 0;
         xdr.onload = handler;
         xdr.onerror = handler;
-        xdr.ontimeout = function () {};
+        xdr.ontimeout = handler;
         xdr.onprogress = function () {};
         xdr.send(request.getBody());
     });
@@ -889,14 +894,16 @@ function jsonpClient (request) {
             handler,
             script;
 
-        handler = function (event) {
+        handler = function (_ref) {
+            var type = _ref.type;
+
 
             var status = 0;
 
-            if (event.type === 'load' && body !== null) {
+            if (type === 'load' && body !== null) {
                 status = 200;
-            } else if (event.type === 'error') {
-                status = 404;
+            } else if (type === 'error') {
+                status = 500;
             }
 
             resolve(request.respondWith(body, { status: status }));

dist/vue-resource.es2015.js

@@ -1,5 +1,5 @@
 /*!
- * vue-resource v1.0.2
+ * vue-resource v1.0.3
  * https://github.com/vuejs/vue-resource
  * Released under the MIT License.
  */
@@ -768,25 +768,30 @@ function xdrClient (request) {
     return new PromiseObj(function (resolve) {
 
         var xdr = new XDomainRequest(),
-            handler = function (event) {
+            handler = function (_ref) {
+            var type = _ref.type;
 
-            var response = request.respondWith(xdr.responseText, {
-                status: xdr.status,
-                statusText: xdr.statusText
-            });
 
-            resolve(response);
+            var status = 0;
+
+            if (type === 'load') {
+                status = 200;
+            } else if (type === 'error') {
+                status = 500;
+            }
+
+            resolve(request.respondWith(xdr.responseText, { status: status }));
         };
 
         request.abort = function () {
             return xdr.abort();
         };
 
-        xdr.open(request.method, request.getUrl(), true);
+        xdr.open(request.method, request.getUrl());
         xdr.timeout = 0;
         xdr.onload = handler;
         xdr.onerror = handler;
-        xdr.ontimeout = function () {};
+        xdr.ontimeout = handler;
         xdr.onprogress = function () {};
         xdr.send(request.getBody());
     });
@@ -887,14 +892,16 @@ function jsonpClient (request) {
             handler,
             script;
 
-        handler = function (event) {
+        handler = function (_ref) {
+            var type = _ref.type;
+
 
             var status = 0;
 
-            if (event.type === 'load' && body !== null) {
+            if (type === 'load' && body !== null) {
                 status = 200;
-            } else if (event.type === 'error') {
-                status = 404;
+            } else if (type === 'error') {
+                status = 500;
             }
 
             resolve(request.respondWith(body, { status: status }));

dist/vue-resource.js

@@ -1,5 +1,5 @@
 /*!
- * vue-resource v1.0.2
+ * vue-resource v1.0.3
  * https://github.com/vuejs/vue-resource
  * Released under the MIT License.
  */
@@ -774,25 +774,30 @@ function xdrClient (request) {
     return new PromiseObj(function (resolve) {
 
         var xdr = new XDomainRequest(),
-            handler = function (event) {
+            handler = function (_ref) {
+            var type = _ref.type;
 
-            var response = request.respondWith(xdr.responseText, {
-                status: xdr.status,
-                statusText: xdr.statusText
-            });
 
-            resolve(response);
+            var status = 0;
+
+            if (type === 'load') {
+                status = 200;
+            } else if (type === 'error') {
+                status = 500;
+            }
+
+            resolve(request.respondWith(xdr.responseText, { status: status }));
         };
 
         request.abort = function () {
             return xdr.abort();
         };
 
-        xdr.open(request.method, request.getUrl(), true);
+        xdr.open(request.method, request.getUrl());
         xdr.timeout = 0;
         xdr.onload = handler;
         xdr.onerror = handler;
-        xdr.ontimeout = function () {};
+        xdr.ontimeout = handler;
         xdr.onprogress = function () {};
         xdr.send(request.getBody());
     });
@@ -893,14 +898,16 @@ function jsonpClient (request) {
             handler,
             script;
 
-        handler = function (event) {
+        handler = function (_ref) {
+            var type = _ref.type;
+
 
             var status = 0;
 
-            if (event.type === 'load' && body !== null) {
+            if (type === 'load' && body !== null) {
                 status = 200;
-            } else if (event.type === 'error') {
-                status = 404;
+            } else if (type === 'error') {
+                status = 500;
             }
 
             resolve(request.respondWith(body, { status: status }));