From bf5e5f7bc9ebc7dc6cf8fdf3c4923498b22a8654 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/Resource.js')

diff --git a/src/Resource.js b/src/Resource.js
index 74d952ed..045ab3a2 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) {
             if (response) {
-- 
cgit v1.2.3