@@ -17,10 +17,6 @@ function mockTemplate() {
17
17
18
18
var interceptors = $httpProvider . interceptors ;
19
19
20
- function statusIsSuccessful ( status ) {
21
- return status >= 200 && status <= 299 ;
22
- }
23
-
24
20
function getInterceptor ( interceptorExpression ) {
25
21
if ( angular . isString ( interceptorExpression ) ) {
26
22
return $injector . get ( interceptorExpression ) ;
@@ -79,23 +75,24 @@ function mockTemplate() {
79
75
return response ;
80
76
}
81
77
78
+ function statusIsSuccessful ( status ) {
79
+ return status >= 200 && status <= 299 ;
80
+ }
81
+
82
82
function getTransformedAndInterceptedResponse ( response ) {
83
83
response = transformResponse ( response ) ;
84
84
85
85
// Response interceptors are invoked in reverse order as per docs
86
86
for ( var i = interceptors . length - 1 ; i >= 0 ; i -- ) {
87
87
var interceptor = getInterceptor ( interceptors [ i ] ) ;
88
88
89
- if ( interceptor . response &&
90
- ( response . status === undefined || statusIsSuccessful ( response . status ) )
91
- ) {
89
+ if ( interceptor . response && statusIsSuccessful ( response . status ) ) {
92
90
$q . when ( interceptor . response ( response ) ) . then ( function ( interceptedResponse ) {
93
91
response = interceptedResponse ;
94
92
} ) ;
95
93
}
96
94
97
- if ( interceptor . responseError &&
98
- ! ( response . status === undefined || statusIsSuccessful ( response . status ) ) ) {
95
+ if ( interceptor . responseError && ! statusIsSuccessful ( response . status ) ) {
99
96
$q . reject ( interceptor . responseError ( response ) ) . then ( null , function ( interceptedResponse ) {
100
97
response = interceptedResponse ;
101
98
} ) ;
@@ -281,11 +278,10 @@ function mockTemplate() {
281
278
resolvedResponse . headers = function ( ) { } ;
282
279
}
283
280
281
+ resolvedResponse . status = resolvedResponse . status || 200 ;
284
282
resolvedResponse = getTransformedAndInterceptedResponse ( resolvedResponse ) ;
285
283
286
284
$q . when ( resolvedResponse ) . then ( function ( resolvedResponse ) {
287
- resolvedResponse . status = resolvedResponse . status || 200 ;
288
-
289
285
if ( statusIsSuccessful ( resolvedResponse . status ) ) {
290
286
deferred . resolve ( resolvedResponse ) ;
291
287
} else {
0 commit comments