@@ -37,7 +37,6 @@ export class CommonServiceBase {
37
37
38
38
this . proxy = null ;
39
39
40
-
41
40
this . index = null ;
42
41
43
42
this . length = null ;
@@ -274,7 +273,7 @@ export class CommonServiceBase {
274
273
timeout : options . async ? 0 : null ,
275
274
proxy : options . proxy
276
275
} )
277
- . then ( function ( response ) {
276
+ . then ( function ( response ) {
278
277
if ( response . text ) {
279
278
return response . text ( ) ;
280
279
}
@@ -283,34 +282,41 @@ export class CommonServiceBase {
283
282
}
284
283
return response ;
285
284
} )
286
- . then ( function ( text ) {
287
- var result = text ;
285
+ . then ( function ( text ) {
286
+ let requestResult = text ;
288
287
if ( typeof text === 'string' ) {
289
- result = new JSONFormat ( ) . read ( text ) ;
288
+ requestResult = new JSONFormat ( ) . read ( text ) ;
290
289
}
291
- if ( ! result || result . error || ( result . code >= 300 && result . code !== 304 ) ) {
292
- if ( result && result . error ) {
293
- result = {
294
- error : result . error
290
+ if (
291
+ ! requestResult ||
292
+ requestResult . error ||
293
+ ( requestResult . code >= 300 && requestResult . code !== 304 )
294
+ ) {
295
+ if ( requestResult && requestResult . error ) {
296
+ requestResult = {
297
+ error : requestResult . error
295
298
} ;
296
299
} else {
297
- result = {
298
- error : result
300
+ requestResult = {
301
+ error : requestResult
299
302
} ;
300
303
}
301
304
}
302
- if ( result . error ) {
305
+ return requestResult ;
306
+ } )
307
+ . catch ( function ( e ) {
308
+ var failure = options . scope ? FunctionExt . bind ( options . failure , options . scope ) : options . failure ;
309
+ failure ( e ) ;
310
+ } )
311
+ . then ( ( requestResult ) => {
312
+ if ( requestResult . error ) {
303
313
var failure = options . scope ? FunctionExt . bind ( options . failure , options . scope ) : options . failure ;
304
- failure ( result ) ;
314
+ failure ( requestResult ) ;
305
315
} else {
306
- result . succeed = result . succeed == undefined ? true : result . succeed ;
316
+ requestResult . succeed = requestResult . succeed == undefined ? true : requestResult . succeed ;
307
317
var success = options . scope ? FunctionExt . bind ( options . success , options . scope ) : options . success ;
308
- success ( result ) ;
318
+ success ( requestResult ) ;
309
319
}
310
- } )
311
- . catch ( function ( e ) {
312
- var failure = options . scope ? FunctionExt . bind ( options . failure , options . scope ) : options . failure ;
313
- failure ( e ) ;
314
320
} ) ;
315
321
}
316
322
}
0 commit comments