From b3ed7a8a7a45882751407fbb645302ee14ce1a79 Mon Sep 17 00:00:00 2001
From: Marcello Nuccio
Date: Fri, 2 Sep 2011 15:50:10 +0200
Subject: fix($resource): action defaults should override resource defaults

defaults definned per action should take precedence over defaults
defined for the whole resource.

This is potentialy a BREAKING CHANGE in case someone relied on the buggy
behavior.
---
 src/Resource.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Resource.js b/src/Resource.js
index 4bf5cf65..e742a0e8 100644
--- a/src/Resource.js
+++ b/src/Resource.js
@@ -109,7 +109,7 @@ ResourceFactory.prototype = {
         var value = this instanceof Resource ? this : (action.isArray ? [] : new Resource(data));
         self.xhr(
           action.method,
-          route.url(extend({}, action.params || {}, extractParams(data), params)),
+          route.url(extend({}, extractParams(data), action.params || {}, params)),
           data,
           function(status, response, responseHeaders) {
             if (response) {
-- 
cgit v1.2.3