This repository was archived by the owner on Apr 12, 2024. It is now read-only.
File tree 2 files changed +13
-8
lines changed
2 files changed +13
-8
lines changed Original file line number Diff line number Diff line change @@ -1276,13 +1276,17 @@ function $HttpProvider() {
1276
1276
if ( eventHandlers ) {
1277
1277
var applyHandlers = { } ;
1278
1278
forEach ( eventHandlers , function ( eventHandler , key ) {
1279
- applyHandlers [ key ] = function ( ) {
1279
+ applyHandlers [ key ] = function ( event ) {
1280
1280
if ( useApplyAsync ) {
1281
- $rootScope . $applyAsync ( eventHandler ) ;
1281
+ $rootScope . $applyAsync ( callEventHandler ) ;
1282
1282
} else if ( $rootScope . $$phase ) {
1283
- eventHandler ( ) ;
1283
+ callEventHandler ( ) ;
1284
1284
} else {
1285
- $rootScope . $apply ( eventHandler ) ;
1285
+ $rootScope . $apply ( callEventHandler ) ;
1286
+ }
1287
+
1288
+ function callEventHandler ( ) {
1289
+ eventHandler ( event ) ;
1286
1290
}
1287
1291
} ;
1288
1292
} ) ;
Original file line number Diff line number Diff line change @@ -1066,14 +1066,15 @@ describe('$http', function() {
1066
1066
expect ( mockXHR . $$events . progress ) . toEqual ( jasmine . any ( Function ) ) ;
1067
1067
expect ( mockXHR . upload . $$events . progress ) . toEqual ( jasmine . any ( Function ) ) ;
1068
1068
1069
+ var eventObj = { } ;
1069
1070
spyOn ( $rootScope , '$digest' ) ;
1070
1071
1071
- mockXHR . $$events . progress ( ) ;
1072
- expect ( progressFn ) . toHaveBeenCalledOnce ( ) ;
1072
+ mockXHR . $$events . progress ( eventObj ) ;
1073
+ expect ( progressFn ) . toHaveBeenCalledOnceWith ( eventObj ) ;
1073
1074
expect ( $rootScope . $digest ) . toHaveBeenCalledTimes ( 1 ) ;
1074
1075
1075
- mockXHR . upload . $$events . progress ( ) ;
1076
- expect ( uploadProgressFn ) . toHaveBeenCalledOnce ( ) ;
1076
+ mockXHR . upload . $$events . progress ( eventObj ) ;
1077
+ expect ( uploadProgressFn ) . toHaveBeenCalledOnceWith ( eventObj ) ;
1077
1078
expect ( $rootScope . $digest ) . toHaveBeenCalledTimes ( 2 ) ;
1078
1079
} ) ;
1079
1080
} ) ;
You can’t perform that action at this time.
0 commit comments