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

Commit 0c28352

Browse files
steffanssteffans
committed
Merge branch 'release/0.7.3'
2 parents 6c28be8 + 79f1f5c commit 0c28352

File tree

8 files changed

+123
-27
lines changed

8 files changed

+123
-27
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.7.2",
5+
"version": "0.7.3",
66
"homepage": "https://github.com/vuejs/vue-resource",
77
"license": "MIT",
88
"ignore": [

‎build/webpack.build.config.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module.exports = [
1919
},
2020
module: {
2121
loaders: [
22-
{test: /.js/, exclude: /node_modules/, loader: 'babel', query: {presets: ['es2015-without-strict']}}
22+
{test: /.js/, exclude: /node_modules/, loader: 'babel', query: {presets: ['es2015']}}
2323
]
2424
},
2525
plugins: [
@@ -37,7 +37,7 @@ module.exports = [
3737
},
3838
module: {
3939
loaders: [
40-
{test: /.js/, exclude: /node_modules/, loader: 'babel', query: {presets: ['es2015-without-strict']}}
40+
{test: /.js/, exclude: /node_modules/, loader: 'babel', query: {presets: ['es2015']}}
4141
]
4242
},
4343
plugins: [
@@ -55,7 +55,7 @@ module.exports = [
5555
},
5656
module: {
5757
loaders: [
58-
{test: /.js/, exclude: /node_modules/, loader: 'babel', query: {presets: ['es2015-without-strict']}}
58+
{test: /.js/, exclude: /node_modules/, loader: 'babel', query: {presets: ['es2015']}}
5959
]
6060
},
6161
plugins: [

‎dist/vue-resource.common.js‎

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* vue-resource v0.7.2
2+
* vue-resource v0.7.3
33
* https://github.com/vuejs/vue-resource
44
* Released under the MIT License.
55
*/
@@ -51,6 +51,8 @@ module.exports =
5151
/* 0 */
5252
/***/ function(module, exports, __webpack_require__) {
5353

54+
'use strict';
55+
5456
/**
5557
* Install plugin.
5658
*/
@@ -115,6 +117,8 @@ module.exports =
115117
/* 1 */
116118
/***/ function(module, exports) {
117119

120+
'use strict';
121+
118122
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
119123

120124
/**
@@ -246,6 +250,8 @@ module.exports =
246250
/* 2 */
247251
/***/ function(module, exports, __webpack_require__) {
248252

253+
'use strict';
254+
249255
/**
250256
* Service for URL templating.
251257
*/
@@ -380,6 +386,8 @@ module.exports =
380386
/* 3 */
381387
/***/ function(module, exports, __webpack_require__) {
382388

389+
'use strict';
390+
383391
/**
384392
* URL Template (RFC 6570) Transform.
385393
*/
@@ -402,6 +410,8 @@ module.exports =
402410
/* 4 */
403411
/***/ function(module, exports) {
404412

413+
'use strict';
414+
405415
/**
406416
* URL Template v2.0.6 (https://github.com/bramstein/url-template)
407417
*/
@@ -560,6 +570,8 @@ module.exports =
560570
/* 5 */
561571
/***/ function(module, exports, __webpack_require__) {
562572

573+
'use strict';
574+
563575
/**
564576
* Legacy Transform.
565577
*/
@@ -604,6 +616,8 @@ module.exports =
604616
/* 6 */
605617
/***/ function(module, exports, __webpack_require__) {
606618

619+
'use strict';
620+
607621
/**
608622
* Query Parameter Transform.
609623
*/
@@ -635,6 +649,8 @@ module.exports =
635649
/* 7 */
636650
/***/ function(module, exports, __webpack_require__) {
637651

652+
'use strict';
653+
638654
/**
639655
* Root Prefix Transform.
640656
*/
@@ -656,6 +672,8 @@ module.exports =
656672
/* 8 */
657673
/***/ function(module, exports, __webpack_require__) {
658674

675+
'use strict';
676+
659677
/**
660678
* Service for sending network requests.
661679
*/
@@ -667,19 +685,19 @@ module.exports =
667685
var jsonType = { 'Content-Type': 'application/json' };
668686

669687
function Http(url, options) {
670-
var _this = this;
671688

672-
var client = Client,
689+
var self = this || {},
690+
client = Client,
673691
request,
674692
promise;
675693

676694
Http.interceptors.forEach(function (handler) {
677-
client = interceptor(handler, _this.$vm)(client);
695+
client = interceptor(handler, self.$vm)(client);
678696
});
679697

680698
options = _.isObject(url) ? url : _.extend({ url: url }, options);
681-
request = _.merge({}, Http.options, this.$options, options);
682-
promise = client(request).bind(this.$vm).then(function (response) {
699+
request = _.merge({}, Http.options, self.$options, options);
700+
promise = client(request).bind(self.$vm).then(function (response) {
683701

684702
return response.ok ? response : Promise.reject(response);
685703
}, function (response) {
@@ -753,6 +771,8 @@ module.exports =
753771
/* 9 */
754772
/***/ function(module, exports, __webpack_require__) {
755773

774+
'use strict';
775+
756776
/**
757777
* Base client.
758778
*/
@@ -822,6 +842,8 @@ module.exports =
822842
/* 10 */
823843
/***/ function(module, exports, __webpack_require__) {
824844

845+
'use strict';
846+
825847
/**
826848
* Promise adapter.
827849
*/
@@ -935,6 +957,8 @@ module.exports =
935957
/* 11 */
936958
/***/ function(module, exports, __webpack_require__) {
937959

960+
'use strict';
961+
938962
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
939963

940964
/**
@@ -1121,6 +1145,8 @@ module.exports =
11211145
/* 12 */
11221146
/***/ function(module, exports, __webpack_require__) {
11231147

1148+
'use strict';
1149+
11241150
/**
11251151
* XMLHttp client.
11261152
*/
@@ -1178,6 +1204,8 @@ module.exports =
11781204
/* 13 */
11791205
/***/ function(module, exports, __webpack_require__) {
11801206

1207+
'use strict';
1208+
11811209
/**
11821210
* Interceptor factory.
11831211
*/
@@ -1228,6 +1256,8 @@ module.exports =
12281256
/* 14 */
12291257
/***/ function(module, exports, __webpack_require__) {
12301258

1259+
'use strict';
1260+
12311261
/**
12321262
* Before Interceptor.
12331263
*/
@@ -1251,6 +1281,8 @@ module.exports =
12511281
/* 15 */
12521282
/***/ function(module, exports) {
12531283

1284+
"use strict";
1285+
12541286
/**
12551287
* Timeout Interceptor.
12561288
*/
@@ -1286,6 +1318,8 @@ module.exports =
12861318
/* 16 */
12871319
/***/ function(module, exports, __webpack_require__) {
12881320

1321+
'use strict';
1322+
12891323
/**
12901324
* JSONP Interceptor.
12911325
*/
@@ -1309,6 +1343,8 @@ module.exports =
13091343
/* 17 */
13101344
/***/ function(module, exports, __webpack_require__) {
13111345

1346+
'use strict';
1347+
13121348
/**
13131349
* JSONP client.
13141350
*/
@@ -1365,6 +1401,8 @@ module.exports =
13651401
/* 18 */
13661402
/***/ function(module, exports) {
13671403

1404+
'use strict';
1405+
13681406
/**
13691407
* HTTP method override Interceptor.
13701408
*/
@@ -1387,6 +1425,8 @@ module.exports =
13871425
/* 19 */
13881426
/***/ function(module, exports, __webpack_require__) {
13891427

1428+
'use strict';
1429+
13901430
/**
13911431
* Mime Interceptor.
13921432
*/
@@ -1428,6 +1468,8 @@ module.exports =
14281468
/* 20 */
14291469
/***/ function(module, exports, __webpack_require__) {
14301470

1471+
'use strict';
1472+
14311473
/**
14321474
* Header Interceptor.
14331475
*/
@@ -1455,6 +1497,8 @@ module.exports =
14551497
/* 21 */
14561498
/***/ function(module, exports, __webpack_require__) {
14571499

1500+
'use strict';
1501+
14581502
/**
14591503
* CORS Interceptor.
14601504
*/
@@ -1497,6 +1541,8 @@ module.exports =
14971541
/* 22 */
14981542
/***/ function(module, exports, __webpack_require__) {
14991543

1544+
'use strict';
1545+
15001546
/**
15011547
* XDomain client (Internet Explorer).
15021548
*/
@@ -1541,6 +1587,8 @@ module.exports =
15411587
/* 23 */
15421588
/***/ function(module, exports, __webpack_require__) {
15431589

1590+
'use strict';
1591+
15441592
/**
15451593
* Service for interacting with RESTful services.
15461594
*/

0 commit comments

Comments
 (0)