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

Commit

Permalink
v0.1.17
Browse files Browse the repository at this point in the history
  • Loading branch information
steffans committed Nov 7, 2015
1 parent 2cb8932 commit 03c7b55
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "vue-resource",
"main": "dist/vue-resource.js",
"description": "A web request service for Vue.js",
"version": "0.1.16",
"version": "0.1.17",
"homepage": "https://github.com/vuejs/vue-resource",
"license": "MIT",
"ignore": [
Expand Down
12 changes: 6 additions & 6 deletions dist/vue-resource.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* vue-resource v0.1.16
* vue-resource v0.1.17
* https://github.com/vuejs/vue-resource
* Released under the MIT License.
*/
Expand All @@ -8,7 +8,7 @@
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory();
else if(typeof define === 'function' && define.amd)
define(factory);
define([], factory);
else if(typeof exports === 'object')
exports["VueResource"] = factory();
else
Expand Down Expand Up @@ -76,13 +76,13 @@ return /******/ (function(modules) { // webpackBootstrap

$url: {
get: function () {
return this._url || (this._url = _.options(Vue.url, this, this.$options.url));
return _.options(Vue.url, this, this.$options.url);
}
},

$http: {
get: function () {
return this._http || (this._http = _.options(Vue.http, this, this.$options.http));
return _.options(Vue.http, this, this.$options.http);
}
},

Expand Down Expand Up @@ -855,7 +855,7 @@ return /******/ (function(modules) { // webpackBootstrap

module.exports = function (_) {

function Resource(url, params, actions) {
function Resource(url, params, actions, options) {

var self = this, resource = {};

Expand All @@ -866,7 +866,7 @@ return /******/ (function(modules) { // webpackBootstrap

_.each(actions, function (action, name) {

action = _.extend(true, {url: url, params: params || {}}, action);
action = _.extend(true, {url: url, params: params || {}}, options, action);

resource[name] = function () {
return (self.$http || _.http)(opts(action, arguments));
Expand Down
4 changes: 2 additions & 2 deletions dist/vue-resource.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 03c7b55

Please sign in to comment.