Skip to content
This repository was archived by the owner on Dec 1, 2023. It is now read-only.

Commit b9c195d

Browse files
steffanssteffans
committed
Merge branch 'release/0.9.2'
2 parents 42ae6cc + 97a3125 commit b9c195d

File tree

7 files changed

+53
-53
lines changed

7 files changed

+53
-53
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vue-resource",
33
"main": "dist/vue-resource.js",
44
"description": "A web request service for Vue.js",
5-
"version": "0.9.1",
5+
"version": "0.9.2",
66
"homepage": "https://github.com/vuejs/vue-resource",
77
"license": "MIT",
88
"ignore": [

‎dist/vue-resource.common.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* vue-resource v0.9.1
2+
* vue-resource v0.9.2
33
* https://github.com/vuejs/vue-resource
44
* Released under the MIT License.
55
*/
@@ -1022,24 +1022,24 @@ function Client (context) {
10221022
}
10231023

10241024
function next(response) {
1025-
when(response, function (response) {
10261025

1027-
if (isFunction(response)) {
1026+
if (isFunction(response)) {
10281027

1029-
resHandlers.unshift(response);
1030-
} else if (isObject(response)) {
1028+
resHandlers.unshift(response);
1029+
} else if (isObject(response)) {
10311030

1032-
resHandlers.forEach(function (handler) {
1033-
handler.call(context, response);
1031+
resHandlers.forEach(function (handler) {
1032+
response = when(response, function (response) {
1033+
return handler.call(context, response) || response;
10341034
});
1035+
});
10351036

1036-
resolve(response);
1037+
when(response, resolve);
10371038

1038-
return;
1039-
}
1039+
return;
1040+
}
10401041

1041-
exec();
1042-
});
1042+
exec();
10431043
}
10441044

10451045
exec();

‎dist/vue-resource.es2015.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* vue-resource v0.9.1
2+
* vue-resource v0.9.2
33
* https://github.com/vuejs/vue-resource
44
* Released under the MIT License.
55
*/
@@ -1020,24 +1020,24 @@ function Client (context) {
10201020
}
10211021

10221022
function next(response) {
1023-
when(response, function (response) {
10241023

1025-
if (isFunction(response)) {
1024+
if (isFunction(response)) {
10261025

1027-
resHandlers.unshift(response);
1028-
} else if (isObject(response)) {
1026+
resHandlers.unshift(response);
1027+
} else if (isObject(response)) {
10291028

1030-
resHandlers.forEach(function (handler) {
1031-
handler.call(context, response);
1029+
resHandlers.forEach(function (handler) {
1030+
response = when(response, function (response) {
1031+
return handler.call(context, response) || response;
10321032
});
1033+
});
10331034

1034-
resolve(response);
1035+
when(response, resolve);
10351036

1036-
return;
1037-
}
1037+
return;
1038+
}
10381039

1039-
exec();
1040-
});
1040+
exec();
10411041
}
10421042

10431043
exec();

‎dist/vue-resource.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* vue-resource v0.9.1
2+
* vue-resource v0.9.2
33
* https://github.com/vuejs/vue-resource
44
* Released under the MIT License.
55
*/
@@ -1026,24 +1026,24 @@
10261026
}
10271027

10281028
function next(response) {
1029-
when(response, function (response) {
10301029

1031-
if (isFunction(response)) {
1030+
if (isFunction(response)) {
10321031

1033-
resHandlers.unshift(response);
1034-
} else if (isObject(response)) {
1032+
resHandlers.unshift(response);
1033+
} else if (isObject(response)) {
10351034

1036-
resHandlers.forEach(function (handler) {
1037-
handler.call(context, response);
1035+
resHandlers.forEach(function (handler) {
1036+
response = when(response, function (response) {
1037+
return handler.call(context, response) || response;
10381038
});
1039+
});
10391040

1040-
resolve(response);
1041+
when(response, resolve);
10411042

1042-
return;
1043-
}
1043+
return;
1044+
}
10441045

1045-
exec();
1046-
});
1046+
exec();
10471047
}
10481048

10491049
exec();

‎dist/vue-resource.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-resource",
3-
"version": "0.9.1",
3+
"version": "0.9.2",
44
"description": "A web request service for Vue.js",
55
"main": "dist/vue-resource.common.js",
66
"jsnext:main": "dist/vue-resource.es2015.js",
@@ -24,7 +24,7 @@
2424
},
2525
"homepage": "https://github.com/vuejs/vue-resource#readme",
2626
"devDependencies": {
27-
"babel-core": "^6.9.1",
27+
"babel-core": "^6.10.4",
2828
"babel-loader": "^6.2.4",
2929
"babel-plugin-transform-runtime": "^6.9.0",
3030
"babel-preset-es2015-loose": "^7.0.0",
@@ -34,7 +34,7 @@
3434
"rollup": "^0.33.0",
3535
"rollup-plugin-babel": "^2.6.1",
3636
"uglify-js": "^2.6.4",
37-
"vue": "^1.0.25",
37+
"vue": "^1.0.26",
3838
"webpack": "^1.13.1"
3939
}
4040
}

‎src/http/client/index.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,25 @@ export default function (context) {
3030
}
3131

3232
function next(response) {
33-
when(response, (response) => {
3433

35-
if (isFunction(response)) {
34+
if (isFunction(response)) {
3635

37-
resHandlers.unshift(response);
36+
resHandlers.unshift(response);
3837

39-
} else if (isObject(response)) {
38+
} else if (isObject(response)) {
4039

41-
resHandlers.forEach((handler) => {
42-
handler.call(context, response);
40+
resHandlers.forEach((handler) => {
41+
response = when(response, (response) => {
42+
return handler.call(context, response) || response;
4343
});
44+
});
4445

45-
resolve(response);
46+
when(response, resolve);
4647

47-
return;
48-
}
48+
return;
49+
}
4950

50-
exec();
51-
});
51+
exec();
5252
}
5353

5454
exec();

0 commit comments

Comments
 (0)