refactor($resource): use route.defaults (already merged provider.defaults + options)

gkalpak · petebacondarwin · commit 024bc1e16027 · 2016-11-24T09:37:54.000Z
Closes angular#15160
diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js
@@ -676,9 +676,8 @@ angular.module('ngResource', ['ng']).
         forEach(actions, function(action, name) {
           var hasBody = /^(POST|PUT|PATCH)$/i.test(action.method);
           var numericTimeout = action.timeout;
-          var cancellable = isDefined(action.cancellable) ? action.cancellable :
-              (options && isDefined(options.cancellable)) ? options.cancellable :
-              provider.defaults.cancellable;
+          var cancellable = isDefined(action.cancellable) ?
+              action.cancellable : route.defaults.cancellable;
 
           if (numericTimeout && !isNumber(numericTimeout)) {
             $log.debug('ngResource:\n' +
