@@ -522,7 +522,10 @@ angular.module('ngResource', ['ng']).
522
522
forEach = angular . forEach ,
523
523
extend = angular . extend ,
524
524
copy = angular . copy ,
525
+ isArray = angular . isArray ,
526
+ isDefined = angular . isDefined ,
525
527
isFunction = angular . isFunction ,
528
+ isNumber = angular . isNumber ,
526
529
encodeUriQuery = angular . $$encodeUriQuery ,
527
530
encodeUriSegment = angular . $$encodeUriSegment ;
528
531
@@ -561,7 +564,7 @@ angular.module('ngResource', ['ng']).
561
564
params = params || { } ;
562
565
forEach ( self . urlParams , function ( paramInfo , urlParam ) {
563
566
val = params . hasOwnProperty ( urlParam ) ? params [ urlParam ] : self . defaults [ urlParam ] ;
564
- if ( angular . isDefined ( val ) && val !== null ) {
567
+ if ( isDefined ( val ) && val !== null ) {
565
568
if ( paramInfo . isQueryParamValue ) {
566
569
encodedVal = encodeUriQuery ( val , true ) ;
567
570
} else {
@@ -639,11 +642,11 @@ angular.module('ngResource', ['ng']).
639
642
forEach ( actions , function ( action , name ) {
640
643
var hasBody = / ^ ( P O S T | P U T | P A T C H ) $ / i. test ( action . method ) ;
641
644
var numericTimeout = action . timeout ;
642
- var cancellable = angular . isDefined ( action . cancellable ) ? action . cancellable :
643
- ( options && angular . isDefined ( options . cancellable ) ) ? options . cancellable :
645
+ var cancellable = isDefined ( action . cancellable ) ? action . cancellable :
646
+ ( options && isDefined ( options . cancellable ) ) ? options . cancellable :
644
647
provider . defaults . cancellable ;
645
648
646
- if ( numericTimeout && ! angular . isNumber ( numericTimeout ) ) {
649
+ if ( numericTimeout && ! isNumber ( numericTimeout ) ) {
647
650
$log . debug ( 'ngResource:\n' +
648
651
' Only numeric values are allowed as `timeout`.\n' +
649
652
' Promises are not supported in $resource, because the same value would ' +
@@ -736,11 +739,11 @@ angular.module('ngResource', ['ng']).
736
739
737
740
if ( data ) {
738
741
// Need to convert action.isArray to boolean in case it is undefined
739
- if ( angular . isArray ( data ) !== ( ! ! action . isArray ) ) {
742
+ if ( isArray ( data ) !== ( ! ! action . isArray ) ) {
740
743
throw $resourceMinErr ( 'badcfg' ,
741
744
'Error in resource configuration for action `{0}`. Expected response to ' +
742
745
'contain an {1} but got an {2} (Request: {3} {4})' , name , action . isArray ? 'array' : 'object' ,
743
- angular . isArray ( data ) ? 'array' : 'object' , httpConfig . method , httpConfig . url ) ;
746
+ isArray ( data ) ? 'array' : 'object' , httpConfig . method , httpConfig . url ) ;
744
747
}
745
748
if ( action . isArray ) {
746
749
value . length = 0 ;
@@ -768,7 +771,7 @@ angular.module('ngResource', ['ng']).
768
771
promise = promise [ 'finally' ] ( function ( ) {
769
772
value . $resolved = true ;
770
773
if ( ! isInstanceCall && cancellable ) {
771
- value . $cancelRequest = angular . noop ;
774
+ value . $cancelRequest = noop ;
772
775
$timeout . cancel ( numericTimeoutPromise ) ;
773
776
timeoutDeferred = numericTimeoutPromise = httpConfig . timeout = null ;
774
777
}
0 commit comments