From ea80f3799f604f7bac6e04406a7e54fd53a14152 Mon Sep 17 00:00:00 2001 From: Steffan Date: Sun, 11 Feb 2018 12:06:49 +0100 Subject: [PATCH] v1.3.6 --- README.md | 4 +- bower.json | 2 +- dist/vue-resource.common.js | 94 ++++++++++++++++++------------------- dist/vue-resource.esm.js | 94 ++++++++++++++++++------------------- dist/vue-resource.js | 94 ++++++++++++++++++------------------- dist/vue-resource.min.js | 4 +- package.json | 2 +- 7 files changed, 144 insertions(+), 150 deletions(-) diff --git a/README.md b/README.md index 92143888..35da3de8 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ $ npm install vue-resource ``` ### CDN -Available on [jsdelivr](https://cdn.jsdelivr.net/npm/vue-resource@1.3.5), [unpkg](https://unpkg.com/vue-resource@1.3.5) or [cdnjs](https://cdnjs.com/libraries/vue-resource). +Available on [jsdelivr](https://cdn.jsdelivr.net/npm/vue-resource@1.3.6), [unpkg](https://unpkg.com/vue-resource@1.3.6) or [cdnjs](https://cdnjs.com/libraries/vue-resource). ```html - + ``` ## Example diff --git a/bower.json b/bower.json index 70cb1638..590b46a5 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "vue-resource", "main": "dist/vue-resource.js", - "version": "1.3.5", + "version": "1.3.6", "description": "The HTTP client for Vue.js", "homepage": "https://github.com/pagekit/vue-resource", "license": "MIT", diff --git a/dist/vue-resource.common.js b/dist/vue-resource.common.js index f76f42ff..a4986345 100644 --- a/dist/vue-resource.common.js +++ b/dist/vue-resource.common.js @@ -1,5 +1,5 @@ /*! - * vue-resource v1.3.5 + * vue-resource v1.3.6 * https://github.com/pagekit/vue-resource * Released under the MIT License. */ @@ -12,7 +12,7 @@ var RESOLVED = 0; var REJECTED = 1; -var PENDING = 2; +var PENDING = 2; function Promise$1(executor) { @@ -78,9 +78,9 @@ Promise$1.race = function race(iterable) { }); }; -var p$1 = Promise$1.prototype; +var p = Promise$1.prototype; -p$1.resolve = function resolve(x) { +p.resolve = function resolve(x) { var promise = this; if (promise.state === PENDING) { @@ -121,7 +121,7 @@ p$1.resolve = function resolve(x) { } }; -p$1.reject = function reject(reason) { +p.reject = function reject(reason) { var promise = this; if (promise.state === PENDING) { @@ -135,7 +135,7 @@ p$1.reject = function reject(reason) { } }; -p$1.notify = function notify() { +p.notify = function notify() { var promise = this; nextTick(function () { @@ -169,7 +169,7 @@ p$1.notify = function notify() { }); }; -p$1.then = function then(onResolved, onRejected) { +p.then = function then(onResolved, onRejected) { var promise = this; return new Promise$1(function (resolve, reject) { @@ -178,7 +178,7 @@ p$1.then = function then(onResolved, onRejected) { }); }; -p$1.catch = function (onRejected) { +p.catch = function (onRejected) { return this.then(undefined, onRejected); }; @@ -217,14 +217,14 @@ PromiseObj.race = function (iterable, context) { return new PromiseObj(Promise.race(iterable), context); }; -var p = PromiseObj.prototype; +var p$1 = PromiseObj.prototype; -p.bind = function (context) { +p$1.bind = function (context) { this.context = context; return this; }; -p.then = function (fulfilled, rejected) { +p$1.then = function (fulfilled, rejected) { if (fulfilled && fulfilled.bind && this.context) { fulfilled = fulfilled.bind(this.context); @@ -237,7 +237,7 @@ p.then = function (fulfilled, rejected) { return new PromiseObj(this.promise.then(fulfilled, rejected), this.context); }; -p.catch = function (rejected) { +p$1.catch = function (rejected) { if (rejected && rejected.bind && this.context) { rejected = rejected.bind(this.context); @@ -246,15 +246,15 @@ p.catch = function (rejected) { return new PromiseObj(this.promise.catch(rejected), this.context); }; -p.finally = function (callback) { +p$1.finally = function (callback) { return this.then(function (value) { - callback.call(this); - return value; - }, function (reason) { - callback.call(this); - return Promise.reject(reason); - } + callback.call(this); + return value; + }, function (reason) { + callback.call(this); + return Promise.reject(reason); + } ); }; @@ -507,7 +507,7 @@ function parse(template) { return { vars: variables, expand: function expand(context) { - return template.replace(/\{([^\{\}]+)\}|([^\{\}]+)/g, function (_, expression, literal) { + return template.replace(/\{([^{}]+)\}|([^{}]+)/g, function (_, expression, literal) { if (expression) { var operator = null, values = []; @@ -518,7 +518,7 @@ function parse(template) { } expression.split(/,/g).forEach(function (variable) { - var tmp = /([^:\*]*)(?::(\d+)|(\*))?/.exec(variable); + var tmp = /([^:*]*)(?::(\d+)|(\*))?/.exec(variable); values.push.apply(values, getValues(context, operator, tmp[1], tmp[2] || tmp[3])); variables.push(tmp[1]); }); @@ -790,19 +790,19 @@ function xdrClient (request) { return new PromiseObj(function (resolve) { var xdr = new XDomainRequest(), handler = function (ref) { - var type = ref.type; + var type = ref.type; - var status = 0; + var status = 0; - if (type === 'load') { - status = 200; - } else if (type === 'error') { - status = 500; - } + if (type === 'load') { + status = 200; + } else if (type === 'error') { + status = 500; + } - resolve(request.respondWith(xdr.responseText, {status: status})); - }; + resolve(request.respondWith(xdr.responseText, {status: status})); + }; request.abort = function () { return xdr.abort(); }; @@ -1035,19 +1035,18 @@ function xhrClient (request) { var xhr = new XMLHttpRequest(), handler = function (event) { - var response = request.respondWith( + var response = request.respondWith( 'response' in xhr ? xhr.response : xhr.responseText, { status: xhr.status === 1223 ? 204 : xhr.status, // IE9 status bug statusText: xhr.status === 1223 ? 'No Content' : trim(xhr.statusText) - } - ); + }); - each(trim(xhr.getAllResponseHeaders()).split('\n'), function (row) { - response.headers.append(row.slice(0, row.indexOf(':')), row.slice(row.indexOf(':') + 1)); - }); + each(trim(xhr.getAllResponseHeaders()).split('\n'), function (row) { + response.headers.append(row.slice(0, row.indexOf(':')), row.slice(row.indexOf(':') + 1)); + }); - resolve(response); - }; + resolve(response); + }; request.abort = function () { return xhr.abort(); }; @@ -1111,10 +1110,9 @@ function nodeClient (request) { client(url, {body: body, method: method, headers: headers}).then(handler = function (resp) { var response = request.respondWith(resp.body, { - status: resp.statusCode, - statusText: trim(resp.statusMessage) - } - ); + status: resp.statusCode, + statusText: trim(resp.statusMessage) + }); each(resp.headers, function (value, name) { response.headers.set(name, value); @@ -1226,7 +1224,7 @@ Headers.prototype.set = function set (name, value) { this.map[normalizeName(getName(this.map, name) || name)] = [trim(value)]; }; -Headers.prototype.append = function append (name, value){ +Headers.prototype.append = function append (name, value) { var list = this.map[getName(this.map, name)]; @@ -1237,11 +1235,11 @@ Headers.prototype.append = function append (name, value){ } }; -Headers.prototype.delete = function delete$1 (name){ +Headers.prototype.delete = function delete$1 (name) { delete this.map[getName(this.map, name)]; }; -Headers.prototype.deleteAll = function deleteAll (){ +Headers.prototype.deleteAll = function deleteAll () { this.map = {}; }; @@ -1261,7 +1259,7 @@ function getName(map, name) { function normalizeName(name) { - if (/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)) { + if (/[^a-z0-9\-#$%&'*+.^_`|~]/i.test(name)) { throw new TypeError('Invalid character in header field name'); } @@ -1359,11 +1357,11 @@ var Request = function Request(options$$1) { } }; -Request.prototype.getUrl = function getUrl (){ +Request.prototype.getUrl = function getUrl () { return Url(this); }; -Request.prototype.getBody = function getBody (){ +Request.prototype.getBody = function getBody () { return this.body; }; diff --git a/dist/vue-resource.esm.js b/dist/vue-resource.esm.js index a12ef09d..fc7ea6eb 100644 --- a/dist/vue-resource.esm.js +++ b/dist/vue-resource.esm.js @@ -1,5 +1,5 @@ /*! - * vue-resource v1.3.5 + * vue-resource v1.3.6 * https://github.com/pagekit/vue-resource * Released under the MIT License. */ @@ -10,7 +10,7 @@ var RESOLVED = 0; var REJECTED = 1; -var PENDING = 2; +var PENDING = 2; function Promise$1(executor) { @@ -76,9 +76,9 @@ Promise$1.race = function race(iterable) { }); }; -var p$1 = Promise$1.prototype; +var p = Promise$1.prototype; -p$1.resolve = function resolve(x) { +p.resolve = function resolve(x) { var promise = this; if (promise.state === PENDING) { @@ -119,7 +119,7 @@ p$1.resolve = function resolve(x) { } }; -p$1.reject = function reject(reason) { +p.reject = function reject(reason) { var promise = this; if (promise.state === PENDING) { @@ -133,7 +133,7 @@ p$1.reject = function reject(reason) { } }; -p$1.notify = function notify() { +p.notify = function notify() { var promise = this; nextTick(function () { @@ -167,7 +167,7 @@ p$1.notify = function notify() { }); }; -p$1.then = function then(onResolved, onRejected) { +p.then = function then(onResolved, onRejected) { var promise = this; return new Promise$1(function (resolve, reject) { @@ -176,7 +176,7 @@ p$1.then = function then(onResolved, onRejected) { }); }; -p$1.catch = function (onRejected) { +p.catch = function (onRejected) { return this.then(undefined, onRejected); }; @@ -215,14 +215,14 @@ PromiseObj.race = function (iterable, context) { return new PromiseObj(Promise.race(iterable), context); }; -var p = PromiseObj.prototype; +var p$1 = PromiseObj.prototype; -p.bind = function (context) { +p$1.bind = function (context) { this.context = context; return this; }; -p.then = function (fulfilled, rejected) { +p$1.then = function (fulfilled, rejected) { if (fulfilled && fulfilled.bind && this.context) { fulfilled = fulfilled.bind(this.context); @@ -235,7 +235,7 @@ p.then = function (fulfilled, rejected) { return new PromiseObj(this.promise.then(fulfilled, rejected), this.context); }; -p.catch = function (rejected) { +p$1.catch = function (rejected) { if (rejected && rejected.bind && this.context) { rejected = rejected.bind(this.context); @@ -244,15 +244,15 @@ p.catch = function (rejected) { return new PromiseObj(this.promise.catch(rejected), this.context); }; -p.finally = function (callback) { +p$1.finally = function (callback) { return this.then(function (value) { - callback.call(this); - return value; - }, function (reason) { - callback.call(this); - return Promise.reject(reason); - } + callback.call(this); + return value; + }, function (reason) { + callback.call(this); + return Promise.reject(reason); + } ); }; @@ -505,7 +505,7 @@ function parse(template) { return { vars: variables, expand: function expand(context) { - return template.replace(/\{([^\{\}]+)\}|([^\{\}]+)/g, function (_, expression, literal) { + return template.replace(/\{([^{}]+)\}|([^{}]+)/g, function (_, expression, literal) { if (expression) { var operator = null, values = []; @@ -516,7 +516,7 @@ function parse(template) { } expression.split(/,/g).forEach(function (variable) { - var tmp = /([^:\*]*)(?::(\d+)|(\*))?/.exec(variable); + var tmp = /([^:*]*)(?::(\d+)|(\*))?/.exec(variable); values.push.apply(values, getValues(context, operator, tmp[1], tmp[2] || tmp[3])); variables.push(tmp[1]); }); @@ -788,19 +788,19 @@ function xdrClient (request) { return new PromiseObj(function (resolve) { var xdr = new XDomainRequest(), handler = function (ref) { - var type = ref.type; + var type = ref.type; - var status = 0; + var status = 0; - if (type === 'load') { - status = 200; - } else if (type === 'error') { - status = 500; - } + if (type === 'load') { + status = 200; + } else if (type === 'error') { + status = 500; + } - resolve(request.respondWith(xdr.responseText, {status: status})); - }; + resolve(request.respondWith(xdr.responseText, {status: status})); + }; request.abort = function () { return xdr.abort(); }; @@ -1033,19 +1033,18 @@ function xhrClient (request) { var xhr = new XMLHttpRequest(), handler = function (event) { - var response = request.respondWith( + var response = request.respondWith( 'response' in xhr ? xhr.response : xhr.responseText, { status: xhr.status === 1223 ? 204 : xhr.status, // IE9 status bug statusText: xhr.status === 1223 ? 'No Content' : trim(xhr.statusText) - } - ); + }); - each(trim(xhr.getAllResponseHeaders()).split('\n'), function (row) { - response.headers.append(row.slice(0, row.indexOf(':')), row.slice(row.indexOf(':') + 1)); - }); + each(trim(xhr.getAllResponseHeaders()).split('\n'), function (row) { + response.headers.append(row.slice(0, row.indexOf(':')), row.slice(row.indexOf(':') + 1)); + }); - resolve(response); - }; + resolve(response); + }; request.abort = function () { return xhr.abort(); }; @@ -1109,10 +1108,9 @@ function nodeClient (request) { client(url, {body: body, method: method, headers: headers}).then(handler = function (resp) { var response = request.respondWith(resp.body, { - status: resp.statusCode, - statusText: trim(resp.statusMessage) - } - ); + status: resp.statusCode, + statusText: trim(resp.statusMessage) + }); each(resp.headers, function (value, name) { response.headers.set(name, value); @@ -1224,7 +1222,7 @@ Headers.prototype.set = function set (name, value) { this.map[normalizeName(getName(this.map, name) || name)] = [trim(value)]; }; -Headers.prototype.append = function append (name, value){ +Headers.prototype.append = function append (name, value) { var list = this.map[getName(this.map, name)]; @@ -1235,11 +1233,11 @@ Headers.prototype.append = function append (name, value){ } }; -Headers.prototype.delete = function delete$1 (name){ +Headers.prototype.delete = function delete$1 (name) { delete this.map[getName(this.map, name)]; }; -Headers.prototype.deleteAll = function deleteAll (){ +Headers.prototype.deleteAll = function deleteAll () { this.map = {}; }; @@ -1259,7 +1257,7 @@ function getName(map, name) { function normalizeName(name) { - if (/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)) { + if (/[^a-z0-9\-#$%&'*+.^_`|~]/i.test(name)) { throw new TypeError('Invalid character in header field name'); } @@ -1357,11 +1355,11 @@ var Request = function Request(options$$1) { } }; -Request.prototype.getUrl = function getUrl (){ +Request.prototype.getUrl = function getUrl () { return Url(this); }; -Request.prototype.getBody = function getBody (){ +Request.prototype.getBody = function getBody () { return this.body; }; diff --git a/dist/vue-resource.js b/dist/vue-resource.js index b0d6811c..60750728 100644 --- a/dist/vue-resource.js +++ b/dist/vue-resource.js @@ -1,5 +1,5 @@ /*! - * vue-resource v1.3.5 + * vue-resource v1.3.6 * https://github.com/pagekit/vue-resource * Released under the MIT License. */ @@ -16,7 +16,7 @@ var RESOLVED = 0; var REJECTED = 1; -var PENDING = 2; +var PENDING = 2; function Promise$1(executor) { @@ -82,9 +82,9 @@ Promise$1.race = function race(iterable) { }); }; -var p$1 = Promise$1.prototype; +var p = Promise$1.prototype; -p$1.resolve = function resolve(x) { +p.resolve = function resolve(x) { var promise = this; if (promise.state === PENDING) { @@ -125,7 +125,7 @@ p$1.resolve = function resolve(x) { } }; -p$1.reject = function reject(reason) { +p.reject = function reject(reason) { var promise = this; if (promise.state === PENDING) { @@ -139,7 +139,7 @@ p$1.reject = function reject(reason) { } }; -p$1.notify = function notify() { +p.notify = function notify() { var promise = this; nextTick(function () { @@ -173,7 +173,7 @@ p$1.notify = function notify() { }); }; -p$1.then = function then(onResolved, onRejected) { +p.then = function then(onResolved, onRejected) { var promise = this; return new Promise$1(function (resolve, reject) { @@ -182,7 +182,7 @@ p$1.then = function then(onResolved, onRejected) { }); }; -p$1.catch = function (onRejected) { +p.catch = function (onRejected) { return this.then(undefined, onRejected); }; @@ -221,14 +221,14 @@ PromiseObj.race = function (iterable, context) { return new PromiseObj(Promise.race(iterable), context); }; -var p = PromiseObj.prototype; +var p$1 = PromiseObj.prototype; -p.bind = function (context) { +p$1.bind = function (context) { this.context = context; return this; }; -p.then = function (fulfilled, rejected) { +p$1.then = function (fulfilled, rejected) { if (fulfilled && fulfilled.bind && this.context) { fulfilled = fulfilled.bind(this.context); @@ -241,7 +241,7 @@ p.then = function (fulfilled, rejected) { return new PromiseObj(this.promise.then(fulfilled, rejected), this.context); }; -p.catch = function (rejected) { +p$1.catch = function (rejected) { if (rejected && rejected.bind && this.context) { rejected = rejected.bind(this.context); @@ -250,15 +250,15 @@ p.catch = function (rejected) { return new PromiseObj(this.promise.catch(rejected), this.context); }; -p.finally = function (callback) { +p$1.finally = function (callback) { return this.then(function (value) { - callback.call(this); - return value; - }, function (reason) { - callback.call(this); - return Promise.reject(reason); - } + callback.call(this); + return value; + }, function (reason) { + callback.call(this); + return Promise.reject(reason); + } ); }; @@ -511,7 +511,7 @@ function parse(template) { return { vars: variables, expand: function expand(context) { - return template.replace(/\{([^\{\}]+)\}|([^\{\}]+)/g, function (_, expression, literal) { + return template.replace(/\{([^{}]+)\}|([^{}]+)/g, function (_, expression, literal) { if (expression) { var operator = null, values = []; @@ -522,7 +522,7 @@ function parse(template) { } expression.split(/,/g).forEach(function (variable) { - var tmp = /([^:\*]*)(?::(\d+)|(\*))?/.exec(variable); + var tmp = /([^:*]*)(?::(\d+)|(\*))?/.exec(variable); values.push.apply(values, getValues(context, operator, tmp[1], tmp[2] || tmp[3])); variables.push(tmp[1]); }); @@ -794,19 +794,19 @@ function xdrClient (request) { return new PromiseObj(function (resolve) { var xdr = new XDomainRequest(), handler = function (ref) { - var type = ref.type; + var type = ref.type; - var status = 0; + var status = 0; - if (type === 'load') { - status = 200; - } else if (type === 'error') { - status = 500; - } + if (type === 'load') { + status = 200; + } else if (type === 'error') { + status = 500; + } - resolve(request.respondWith(xdr.responseText, {status: status})); - }; + resolve(request.respondWith(xdr.responseText, {status: status})); + }; request.abort = function () { return xdr.abort(); }; @@ -1039,19 +1039,18 @@ function xhrClient (request) { var xhr = new XMLHttpRequest(), handler = function (event) { - var response = request.respondWith( + var response = request.respondWith( 'response' in xhr ? xhr.response : xhr.responseText, { status: xhr.status === 1223 ? 204 : xhr.status, // IE9 status bug statusText: xhr.status === 1223 ? 'No Content' : trim(xhr.statusText) - } - ); + }); - each(trim(xhr.getAllResponseHeaders()).split('\n'), function (row) { - response.headers.append(row.slice(0, row.indexOf(':')), row.slice(row.indexOf(':') + 1)); - }); + each(trim(xhr.getAllResponseHeaders()).split('\n'), function (row) { + response.headers.append(row.slice(0, row.indexOf(':')), row.slice(row.indexOf(':') + 1)); + }); - resolve(response); - }; + resolve(response); + }; request.abort = function () { return xhr.abort(); }; @@ -1115,10 +1114,9 @@ function nodeClient (request) { client(url, {body: body, method: method, headers: headers}).then(handler = function (resp) { var response = request.respondWith(resp.body, { - status: resp.statusCode, - statusText: trim(resp.statusMessage) - } - ); + status: resp.statusCode, + statusText: trim(resp.statusMessage) + }); each(resp.headers, function (value, name) { response.headers.set(name, value); @@ -1230,7 +1228,7 @@ Headers.prototype.set = function set (name, value) { this.map[normalizeName(getName(this.map, name) || name)] = [trim(value)]; }; -Headers.prototype.append = function append (name, value){ +Headers.prototype.append = function append (name, value) { var list = this.map[getName(this.map, name)]; @@ -1241,11 +1239,11 @@ Headers.prototype.append = function append (name, value){ } }; -Headers.prototype.delete = function delete$1 (name){ +Headers.prototype.delete = function delete$1 (name) { delete this.map[getName(this.map, name)]; }; -Headers.prototype.deleteAll = function deleteAll (){ +Headers.prototype.deleteAll = function deleteAll () { this.map = {}; }; @@ -1265,7 +1263,7 @@ function getName(map, name) { function normalizeName(name) { - if (/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)) { + if (/[^a-z0-9\-#$%&'*+.^_`|~]/i.test(name)) { throw new TypeError('Invalid character in header field name'); } @@ -1363,11 +1361,11 @@ var Request = function Request(options$$1) { } }; -Request.prototype.getUrl = function getUrl (){ +Request.prototype.getUrl = function getUrl () { return Url(this); }; -Request.prototype.getBody = function getBody (){ +Request.prototype.getBody = function getBody () { return this.body; }; diff --git a/dist/vue-resource.min.js b/dist/vue-resource.min.js index aab3bda4..c73a93f4 100644 --- a/dist/vue-resource.min.js +++ b/dist/vue-resource.min.js @@ -1,7 +1,7 @@ /*! - * vue-resource v1.3.5 + * vue-resource v1.3.6 * https://github.com/pagekit/vue-resource * Released under the MIT License. */ -!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.VueResource=e()}(this,function(){"use strict";function t(t){this.state=$,this.value=void 0,this.deferred=[];var e=this;try{t(function(t){e.resolve(t)},function(t){e.reject(t)})}catch(t){e.reject(t)}}function e(t,e){t instanceof Promise?this.promise=t:this.promise=new Promise(t.bind(e)),this.context=e}function n(t){return t?t.replace(/^\s*|\s*$/g,""):""}function o(t){return t?t.toLowerCase():""}function r(t){return"string"==typeof t}function i(t){return"function"==typeof t}function s(t){return null!==t&&"object"==typeof t}function u(t){return s(t)&&Object.getPrototypeOf(t)==Object.prototype}function a(t,n,o){var r=e.resolve(t);return arguments.length<2?r:r.then(n,o)}function c(t,e,n){return n=n||{},i(n)&&(n=n.call(e)),p(t.bind({$vm:e,$options:n}),t,{$options:n})}function f(t,e){var n,o;if(H(t))for(n=0;n=200&&s<300,this.status=s||0,this.statusText=u||"",this.headers=new M(i),this.body=t,r(t)?this.bodyText=t:function(t){return"undefined"!=typeof Blob&&t instanceof Blob}(t)&&(this.bodyBlob=t,function(t){return 0===t.type.indexOf("text")||-1!==t.type.indexOf("json")}(t)&&(this.bodyText=function(t){return new e(function(e){var n=new FileReader;n.readAsText(t),n.onload=function(){e(n.result)}})}(t)))};N.prototype.blob=function(){return a(this.bodyBlob)},N.prototype.text=function(){return a(this.bodyText)},N.prototype.json=function(){return a(this.text(),function(t){return JSON.parse(t)})},Object.defineProperty(N.prototype,"data",{get:function(){return this.body},set:function(t){this.body=t}});var D=function(t){this.body=null,this.params={},L(this,t,{method:function(t){return t?t.toUpperCase():""}(t.method||"GET")}),this.headers instanceof M||(this.headers=new M(this.headers))};D.prototype.getUrl=function(){return b(this)},D.prototype.getBody=function(){return this.body},D.prototype.respondWith=function(t,e){return new N(t,L(e||{},{url:this.getUrl()}))};var J={"Content-Type":"application/json;charset=utf-8"};return O.options={},O.headers={put:J,post:J,patch:J,delete:J,common:{Accept:"application/json, text/plain, */*"},custom:{}},O.interceptor={before:function(t,e){i(t.before)&&t.before.call(this,t),e()},method:function(t,e){t.emulateHTTP&&/^(PUT|PATCH|DELETE)$/i.test(t.method)&&(t.headers.set("X-HTTP-Method-Override",t.method),t.method="POST"),e()},jsonp:function(t,e){"JSONP"==t.method&&(t.client=T),e()},json:function(t,e){var n=t.headers.get("Content-Type")||"";s(t.body)&&0===n.indexOf("application/json")&&(t.body=JSON.stringify(t.body)),e(function(t){return t.bodyText?a(t.text(),function(e){if(0===(n=t.headers.get("Content-Type")||"").indexOf("application/json")||function(t){var e=t.match(/^\s*(\[|\{)/);return e&&{"[":/]\s*$/,"{":/}\s*$/}[e[1]].test(t)}(e))try{t.body=JSON.parse(e)}catch(e){t.body=null}else t.body=e;return t}):t})},form:function(t,e){!function(t){return"undefined"!=typeof FormData&&t instanceof FormData}(t.body)?s(t.body)&&t.emulateJSON&&(t.body=b.params(t.body),t.headers.set("Content-Type","application/x-www-form-urlencoded")):t.headers.delete("Content-Type"),e()},header:function(t,e){f(L({},O.headers.common,t.crossOrigin?{}:O.headers.custom,O.headers[o(t.method)]),function(e,n){t.headers.has(n)||t.headers.set(n,e)}),e()},cors:function(t,e){if(q){var n=b.parse(location.href),o=b.parse(t.getUrl());o.protocol===n.protocol&&o.host===n.host||(t.crossOrigin=!0,t.emulateHTTP=!1,B||(t.client=w))}e()}},O.interceptors=["before","method","jsonp","json","form","header","cors"],["get","delete","head","jsonp"].forEach(function(t){O[t]=function(e,n){return this(L(n||{},{url:e,method:t}))}}),["post","put","patch"].forEach(function(t){O[t]=function(e,n,o){return this(L(o||{},{url:e,method:t,body:n}))}}),P.actions={get:{method:"GET"},save:{method:"POST"},query:{method:"GET"},update:{method:"PUT"},remove:{method:"DELETE"},delete:{method:"DELETE"}},"undefined"!=typeof window&&window.Vue&&window.Vue.use(C),C}); \ No newline at end of file +!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.VueResource=e()}(this,function(){"use strict";var t=2;function e(e){this.state=t,this.value=void 0,this.deferred=[];var n=this;try{e(function(t){n.resolve(t)},function(t){n.reject(t)})}catch(t){n.reject(t)}}e.reject=function(t){return new e(function(e,n){n(t)})},e.resolve=function(t){return new e(function(e,n){e(t)})},e.all=function(t){return new e(function(n,o){var r=0,i=[];function s(e){return function(o){i[e]=o,(r+=1)===t.length&&n(i)}}0===t.length&&n(i);for(var u=0;u=200&&u<300,this.status=u||0,this.statusText=a||"",this.headers=new H(s),this.body=t,d(t)?this.bodyText=t:"undefined"!=typeof Blob&&t instanceof Blob&&(this.bodyBlob=t,(0===(r=t).type.indexOf("text")||-1!==r.type.indexOf("json"))&&(this.bodyText=(n=t,new o(function(t){var e=new FileReader;e.readAsText(n),e.onload=function(){t(e.result)}}))))};B.prototype.blob=function(){return v(this.bodyBlob)},B.prototype.text=function(){return v(this.bodyText)},B.prototype.json=function(){return v(this.text(),function(t){return JSON.parse(t)})},Object.defineProperty(B.prototype,"data",{get:function(){return this.body},set:function(t){this.body=t}});var M=function(t){var e;this.body=null,this.params={},w(this,t,{method:(e=t.method||"GET",e?e.toUpperCase():"")}),this.headers instanceof H||(this.headers=new H(this.headers))};M.prototype.getUrl=function(){return $(this)},M.prototype.getBody=function(){return this.body},M.prototype.respondWith=function(t,e){return new B(t,w(e||{},{url:this.getUrl()}))};var N={"Content-Type":"application/json;charset=utf-8"};function D(t){var e=this||{},n=I(e.$vm);return function(t){u.call(arguments,1).forEach(function(e){for(var n in e)void 0===t[n]&&(t[n]=e[n])})}(t||{},e.$options,D.options),D.interceptors.forEach(function(t){d(t)&&(t=D.interceptor[t]),l(t)&&n.use(t)}),n(new M(t)).then(function(t){return t.ok?t:o.reject(t)},function(t){var e;return t instanceof Error&&(e=t,"undefined"!=typeof console&&console.error(e)),o.reject(t)})}function J(t,e,n,o){var r=this||{},i={};return g(n=w({},J.actions,n),function(n,s){n=T({url:t,params:w({},e)},o,n),i[s]=function(){return(r.$http||D)(function(t,e){var n,o=w({},t),r={};switch(e.length){case 2:r=e[0],n=e[1];break;case 1:/^(POST|PUT|PATCH)$/i.test(o.method)?n=e[0]:r=e[0];break;case 0:break;default:throw"Expected up to 2 arguments [params, body], got "+e.length+" arguments"}return o.body=n,o.params=w({},o.params,r),o}(n,arguments))}}),i}function W(t){var e,n,r;W.installed||(n=(e=t).config,r=e.nextTick,i=r,a=n.debug||!n.silent,t.url=$,t.http=D,t.resource=J,t.Promise=o,Object.defineProperties(t.prototype,{$url:{get:function(){return b(t.url,this,this.$options.url)}},$http:{get:function(){return b(t.http,this,this.$options.http)}},$resource:{get:function(){return t.resource.bind(this)}},$promise:{get:function(){var e=this;return function(n){return new t.Promise(n,e)}}}}))}return D.options={},D.headers={put:N,post:N,patch:N,delete:N,common:{Accept:"application/json, text/plain, */*"},custom:{}},D.interceptor={before:function(t,e){l(t.before)&&t.before.call(this,t),e()},method:function(t,e){t.emulateHTTP&&/^(PUT|PATCH|DELETE)$/i.test(t.method)&&(t.headers.set("X-HTTP-Method-Override",t.method),t.method="POST"),e()},jsonp:function(t,e){"JSONP"==t.method&&(t.client=A),e()},json:function(t,e){var n=t.headers.get("Content-Type")||"";m(t.body)&&0===n.indexOf("application/json")&&(t.body=JSON.stringify(t.body)),e(function(t){return t.bodyText?v(t.text(),function(e){if(0===(n=t.headers.get("Content-Type")||"").indexOf("application/json")||(r=(o=e).match(/^\s*(\[|\{)/))&&{"[":/]\s*$/,"{":/}\s*$/}[r[1]].test(o))try{t.body=JSON.parse(e)}catch(e){t.body=null}else t.body=e;var o,r;return t}):t})},form:function(t,e){var n;n=t.body,"undefined"!=typeof FormData&&n instanceof FormData?t.headers.delete("Content-Type"):m(t.body)&&t.emulateJSON&&(t.body=$.params(t.body),t.headers.set("Content-Type","application/x-www-form-urlencoded")),e()},header:function(t,e){g(w({},D.headers.common,t.crossOrigin?{}:D.headers.custom,D.headers[p(t.method)]),function(e,n){t.headers.has(n)||t.headers.set(n,e)}),e()},cors:function(t,e){if(c){var n=$.parse(location.href),o=$.parse(t.getUrl());o.protocol===n.protocol&&o.host===n.host||(t.crossOrigin=!0,t.emulateHTTP=!1,R||(t.client=U))}e()}},D.interceptors=["before","method","jsonp","json","form","header","cors"],["get","delete","head","jsonp"].forEach(function(t){D[t]=function(e,n){return this(w(n||{},{url:e,method:t}))}}),["post","put","patch"].forEach(function(t){D[t]=function(e,n,o){return this(w(o||{},{url:e,method:t,body:n}))}}),J.actions={get:{method:"GET"},save:{method:"POST"},query:{method:"GET"},update:{method:"PUT"},remove:{method:"DELETE"},delete:{method:"DELETE"}},"undefined"!=typeof window&&window.Vue&&window.Vue.use(W),W}); \ No newline at end of file diff --git a/package.json b/package.json index ea030259..2370622f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-resource", - "version": "1.3.5", + "version": "1.3.6", "main": "dist/vue-resource.common.js", "module": "dist/vue-resource.esm.js", "unpkg": "dist/vue-resource.min.js",