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

Commit db598a8

Browse files
committed
v0.1.10
1 parent 1471889 commit db598a8

File tree

4 files changed

+20
-22
lines changed

4 files changed

+20
-22
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.1.9",
5+
"version": "0.1.10",
66
"homepage": "https://github.com/vuejs/vue-resource",
77
"license": "MIT",
88
"ignore": [

dist/vue-resource.js

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* vue-resource v0.1.9
2+
* vue-resource v0.1.10
33
* https://github.com/vuejs/vue-resource
44
* Released under the MIT License.
55
*/
@@ -359,7 +359,7 @@ return /******/ (function(modules) { // webpackBootstrap
359359
}
360360

361361
options = _.extend(true, {url: url},
362-
Http.options, _.options('http', this, options)
362+
Http.options, _.options('http', self, options)
363363
);
364364

365365
if (options.crossOrigin === null) {
@@ -378,7 +378,7 @@ return /******/ (function(modules) { // webpackBootstrap
378378
delete options.data;
379379
}
380380

381-
if (options.emulateHTTP && !option.crossOrigin && /^(put|patch|delete)$/i.test(options.method)) {
381+
if (options.emulateHTTP && !options.crossOrigin && /^(put|patch|delete)$/i.test(options.method)) {
382382
options.headers['X-HTTP-Method-Override'] = options.method;
383383
options.method = 'post';
384384
}
@@ -396,7 +396,7 @@ return /******/ (function(modules) { // webpackBootstrap
396396
options.data = JSON.stringify(options.data);
397397
}
398398

399-
promise = (options.method.toLowerCase() == 'jsonp' ? jsonp : xhr).call(this, this.$url || Url, options);
399+
promise = (options.method.toLowerCase() == 'jsonp' ? jsonp : xhr).call(self, self.$url || Url, options);
400400

401401
promise.then(transformResponse, transformResponse);
402402

@@ -565,9 +565,13 @@ return /******/ (function(modules) { // webpackBootstrap
565565
* Promises/A+ polyfill v1.1.0 (https://github.com/bramstein/promis)
566566
*/
567567

568+
var RESOLVED = 0;
569+
var REJECTED = 1;
570+
var PENDING = 2;
571+
568572
function Promise(executor) {
569573

570-
this.state = Promise.State.PENDING;
574+
this.state = PENDING;
571575
this.value = undefined;
572576
this.deferred = [];
573577

@@ -584,12 +588,6 @@ return /******/ (function(modules) { // webpackBootstrap
584588
}
585589
}
586590

587-
Promise.State = {
588-
RESOLVED: 0,
589-
REJECTED: 1,
590-
PENDING: 2
591-
};
592-
593591
Promise.reject = function (r) {
594592
return new Promise(function (resolve, reject) {
595593
reject(r);
@@ -641,7 +639,7 @@ return /******/ (function(modules) { // webpackBootstrap
641639
p.resolve = function resolve(x) {
642640
var promise = this;
643641

644-
if (promise.state === Promise.State.PENDING) {
642+
if (promise.state === PENDING) {
645643
if (x === promise) {
646644
throw new TypeError('Promise settled with itself.');
647645
}
@@ -672,7 +670,7 @@ return /******/ (function(modules) { // webpackBootstrap
672670
}
673671
return;
674672
}
675-
promise.state = Promise.State.RESOLVED;
673+
promise.state = RESOLVED;
676674
promise.value = x;
677675
promise.notify();
678676
}
@@ -681,12 +679,12 @@ return /******/ (function(modules) { // webpackBootstrap
681679
p.reject = function reject(reason) {
682680
var promise = this;
683681

684-
if (promise.state === Promise.State.PENDING) {
682+
if (promise.state === PENDING) {
685683
if (reason === promise) {
686684
throw new TypeError('Promise settled with itself.');
687685
}
688686

689-
promise.state = Promise.State.REJECTED;
687+
promise.state = REJECTED;
690688
promise.value = reason;
691689
promise.notify();
692690
}
@@ -696,7 +694,7 @@ return /******/ (function(modules) { // webpackBootstrap
696694
var promise = this;
697695

698696
async(function () {
699-
if (promise.state !== Promise.State.PENDING) {
697+
if (promise.state !== PENDING) {
700698
while (promise.deferred.length) {
701699
var deferred = promise.deferred.shift(),
702700
onResolved = deferred[0],
@@ -705,13 +703,13 @@ return /******/ (function(modules) { // webpackBootstrap
705703
reject = deferred[3];
706704

707705
try {
708-
if (promise.state === Promise.State.RESOLVED) {
706+
if (promise.state === RESOLVED) {
709707
if (typeof onResolved === 'function') {
710708
resolve(onResolved.call(undefined, promise.value));
711709
} else {
712710
resolve(promise.value);
713711
}
714-
} else if (promise.state === Promise.State.REJECTED) {
712+
} else if (promise.state === REJECTED) {
715713
if (typeof onRejected === 'function') {
716714
resolve(onRejected.call(undefined, promise.value));
717715
} else {

0 commit comments

Comments
 (0)