Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit ddac3b3

Browse files
gkalpakpetebacondarwin
authored andcommitted
fix($http): pass event object to eventHandlers/uploadEventHandlers
Fixes #14436
1 parent 0d55298 commit ddac3b3

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

src/ng/http.js

+8-4
Original file line numberDiff line numberDiff line change
@@ -1276,13 +1276,17 @@ function $HttpProvider() {
12761276
if (eventHandlers) {
12771277
var applyHandlers = {};
12781278
forEach(eventHandlers, function(eventHandler, key) {
1279-
applyHandlers[key] = function() {
1279+
applyHandlers[key] = function(event) {
12801280
if (useApplyAsync) {
1281-
$rootScope.$applyAsync(eventHandler);
1281+
$rootScope.$applyAsync(callEventHandler);
12821282
} else if ($rootScope.$$phase) {
1283-
eventHandler();
1283+
callEventHandler();
12841284
} else {
1285-
$rootScope.$apply(eventHandler);
1285+
$rootScope.$apply(callEventHandler);
1286+
}
1287+
1288+
function callEventHandler() {
1289+
eventHandler(event);
12861290
}
12871291
};
12881292
});

test/ng/httpSpec.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1066,14 +1066,15 @@ describe('$http', function() {
10661066
expect(mockXHR.$$events.progress).toEqual(jasmine.any(Function));
10671067
expect(mockXHR.upload.$$events.progress).toEqual(jasmine.any(Function));
10681068

1069+
var eventObj = {};
10691070
spyOn($rootScope, '$digest');
10701071

1071-
mockXHR.$$events.progress();
1072-
expect(progressFn).toHaveBeenCalledOnce();
1072+
mockXHR.$$events.progress(eventObj);
1073+
expect(progressFn).toHaveBeenCalledOnceWith(eventObj);
10731074
expect($rootScope.$digest).toHaveBeenCalledTimes(1);
10741075

1075-
mockXHR.upload.$$events.progress();
1076-
expect(uploadProgressFn).toHaveBeenCalledOnce();
1076+
mockXHR.upload.$$events.progress(eventObj);
1077+
expect(uploadProgressFn).toHaveBeenCalledOnceWith(eventObj);
10771078
expect($rootScope.$digest).toHaveBeenCalledTimes(2);
10781079
});
10791080
});

0 commit comments

Comments
 (0)