Merge branch 'release/0.9.2'

pagekit · Jul 1, 2016 · b9c195d · b9c195d
2 parents 42ae6cc + 97a3125
commit b9c195d
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 53 deletions.
diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "name": "vue-resource",
   "main": "dist/vue-resource.js",
   "description": "A web request service for Vue.js",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "homepage": "https://github.com/vuejs/vue-resource",
   "license": "MIT",
   "ignore": [

diff --git a/dist/vue-resource.common.js b/dist/vue-resource.common.js
@@ -1,5 +1,5 @@
 /*!
- * vue-resource v0.9.1
+ * vue-resource v0.9.2
  * https://github.com/vuejs/vue-resource
  * Released under the MIT License.
  */
@@ -1022,24 +1022,24 @@ function Client (context) {
             }
 
             function next(response) {
-                when(response, function (response) {
 
-                    if (isFunction(response)) {
+                if (isFunction(response)) {
 
-                        resHandlers.unshift(response);
-                    } else if (isObject(response)) {
+                    resHandlers.unshift(response);
+                } else if (isObject(response)) {
 
-                        resHandlers.forEach(function (handler) {
-                            handler.call(context, response);
+                    resHandlers.forEach(function (handler) {
+                        response = when(response, function (response) {
+                            return handler.call(context, response) || response;
                         });
+                    });
 
-                        resolve(response);
+                    when(response, resolve);
 
-                        return;
-                    }
+                    return;
+                }
 
-                    exec();
-                });
+                exec();
             }
 
             exec();

diff --git a/dist/vue-resource.es2015.js b/dist/vue-resource.es2015.js
@@ -1,5 +1,5 @@
 /*!
- * vue-resource v0.9.1
+ * vue-resource v0.9.2
  * https://github.com/vuejs/vue-resource
  * Released under the MIT License.
  */
@@ -1020,24 +1020,24 @@ function Client (context) {
             }
 
             function next(response) {
-                when(response, function (response) {
 
-                    if (isFunction(response)) {
+                if (isFunction(response)) {
 
-                        resHandlers.unshift(response);
-                    } else if (isObject(response)) {
+                    resHandlers.unshift(response);
+                } else if (isObject(response)) {
 
-                        resHandlers.forEach(function (handler) {
-                            handler.call(context, response);
+                    resHandlers.forEach(function (handler) {
+                        response = when(response, function (response) {
+                            return handler.call(context, response) || response;
                         });
+                    });
 
-                        resolve(response);
+                    when(response, resolve);
 
-                        return;
-                    }
+                    return;
+                }
 
-                    exec();
-                });
+                exec();
             }
 
             exec();

diff --git a/dist/vue-resource.js b/dist/vue-resource.js
@@ -1,5 +1,5 @@
 /*!
- * vue-resource v0.9.1
+ * vue-resource v0.9.2
  * https://github.com/vuejs/vue-resource
  * Released under the MIT License.
  */
@@ -1026,24 +1026,24 @@
               }
 
               function next(response) {
-                  when(response, function (response) {
 
-                      if (isFunction(response)) {
+                  if (isFunction(response)) {
 
-                          resHandlers.unshift(response);
-                      } else if (isObject(response)) {
+                      resHandlers.unshift(response);
+                  } else if (isObject(response)) {
 
-                          resHandlers.forEach(function (handler) {
-                              handler.call(context, response);
+                      resHandlers.forEach(function (handler) {
+                          response = when(response, function (response) {
+                              return handler.call(context, response) || response;
                           });
+                      });
 
-                          resolve(response);
+                      when(response, resolve);
 
-                          return;
-                      }
+                      return;
+                  }
 
-                      exec();
-                  });
+                  exec();
               }
 
               exec();

diff --git a/dist/vue-resource.min.js b/dist/vue-resource.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-resource",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "A web request service for Vue.js",
   "main": "dist/vue-resource.common.js",
   "jsnext:main": "dist/vue-resource.es2015.js",
@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/vuejs/vue-resource#readme",
   "devDependencies": {
-    "babel-core": "^6.9.1",
+    "babel-core": "^6.10.4",
     "babel-loader": "^6.2.4",
     "babel-plugin-transform-runtime": "^6.9.0",
     "babel-preset-es2015-loose": "^7.0.0",
@@ -34,7 +34,7 @@
     "rollup": "^0.33.0",
     "rollup-plugin-babel": "^2.6.1",
     "uglify-js": "^2.6.4",
-    "vue": "^1.0.25",
+    "vue": "^1.0.26",
     "webpack": "^1.13.1"
   }
 }
diff --git a/src/http/client/index.js b/src/http/client/index.js
@@ -30,25 +30,25 @@ export default function (context) {
             }
 
             function next(response) {
-                when(response, (response) => {
 
-                    if (isFunction(response)) {
+                if (isFunction(response)) {
 
-                        resHandlers.unshift(response);
+                    resHandlers.unshift(response);
 
-                    } else if (isObject(response)) {
+                } else if (isObject(response)) {
 
-                        resHandlers.forEach((handler) => {
-                            handler.call(context, response);
+                    resHandlers.forEach((handler) => {
+                        response = when(response, (response) => {
+                            return handler.call(context, response) || response;
                         });
+                    });
 
-                        resolve(response);
+                    when(response, resolve);
 
-                        return;
-                    }
+                    return;
+                }
 
-                    exec();
-                });
+                exec();
             }
 
             exec();