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

fix($timeout/$interval): if invokeApply is false, do not use evalAsync #7999

Closed
wants to merge 1 commit into from
Closed

fix($timeout/$interval): if invokeApply is false, do not use evalAsync #7999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/AngularPublic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
$ParseProvider,
$RootScopeProvider,
$QProvider,
$$QProvider,
$$SanitizeUriProvider,
$SceProvider,
$SceDelegateProvider,
Expand Down Expand Up @@ -222,6 +223,7 @@ function publishExternalAPI(angular){
$parse: $ParseProvider,
$rootScope: $RootScopeProvider,
$q: $QProvider,
$$q: $$QProvider,
$sce: $SceProvider,
$sceDelegate: $SceDelegateProvider,
$sniffer: $SnifferProvider,
Expand Down
10 changes: 5 additions & 5 deletions src/ng/interval.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@


function $IntervalProvider() {
this.$get = ['$rootScope', '$window', '$q',
function($rootScope, $window, $q) {
this.$get = ['$rootScope', '$window', '$q', '$$q',
function($rootScope, $window, $q, $$q) {
var intervals = {};


Expand Down Expand Up @@ -133,10 +133,10 @@ function $IntervalProvider() {
function interval(fn, delay, count, invokeApply) {
var setInterval = $window.setInterval,
clearInterval = $window.clearInterval,
deferred = $q.defer(),
promise = deferred.promise,
iteration = 0,
skipApply = (isDefined(invokeApply) && !invokeApply);
skipApply = (isDefined(invokeApply) && !invokeApply),
deferred = (skipApply ? $$q : $q).defer(),
promise = deferred.promise;

count = isDefined(count) ? count : 0;

Expand Down
7 changes: 7 additions & 0 deletions src/ng/q.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,13 @@ function $QProvider() {
}];
}

function $$QProvider() {
this.$get = ['$browser', '$exceptionHandler', function($browser, $exceptionHandler) {
return qFactory(function(callback) {
$browser.defer(callback);
}, $exceptionHandler);
}];
}

/**
* Constructs a promise manager.
Expand Down
8 changes: 4 additions & 4 deletions src/ng/timeout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@


function $TimeoutProvider() {
this.$get = ['$rootScope', '$browser', '$q', '$exceptionHandler',
function($rootScope, $browser, $q, $exceptionHandler) {
this.$get = ['$rootScope', '$browser', '$q', '$$q', '$exceptionHandler',
function($rootScope, $browser, $q, $$q, $exceptionHandler) {
var deferreds = {};


Expand Down Expand Up @@ -33,9 +33,9 @@ function $TimeoutProvider() {
*
*/
function timeout(fn, delay, invokeApply) {
var deferred = $q.defer(),
var skipApply = (isDefined(invokeApply) && !invokeApply),
deferred = (skipApply ? $$q : $q).defer(),
promise = deferred.promise,
skipApply = (isDefined(invokeApply) && !invokeApply),
timeoutId;

timeoutId = $browser.defer(function() {
Expand Down
17 changes: 17 additions & 0 deletions test/ng/intervalSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,23 @@ describe('$interval', function() {
}));


it('should NOT call $evalAsync or $digest if invokeApply is set to false',
inject(function($interval, $rootScope, $window, $timeout) {
var evalAsyncSpy = spyOn($rootScope, '$evalAsync').andCallThrough();
var digestSpy = spyOn($rootScope, '$digest').andCallThrough();
var notifySpy = jasmine.createSpy('notify');

$interval(notifySpy, 1000, 1, false);

$window.flush(2000);
$timeout.flush(); // flush $browser.defer() timeout
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we can use $browser.defer.flush here, which makes more sense than using $timeout.flush for this.
Same thing for test in timeoutSpec

Edit: $timeout.flush just calls $browser.defer.flush anyway

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$timeout.flush is $browser.defer.flush, there's no difference --- it's just easier to read.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel it introduces more concepts to have in mind while reading the test, but that's just me.


expect(notifySpy).toHaveBeenCalledOnce();
expect(evalAsyncSpy).not.toHaveBeenCalled();
expect(digestSpy).not.toHaveBeenCalled();
}));


it('should allow you to specify the delay time', inject(function($interval, $window) {
var counter = 0;
$interval(function() { counter++; }, 123);
Expand Down
16 changes: 16 additions & 0 deletions test/ng/timeoutSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,22 @@ describe('$timeout', function() {
}));


it('should NOT call $evalAsync or $digest if invokeApply is set to false',
inject(function($timeout, $rootScope) {
var evalAsyncSpy = spyOn($rootScope, '$evalAsync').andCallThrough();
var digestSpy = spyOn($rootScope, '$digest').andCallThrough();
var fulfilledSpy = jasmine.createSpy('fulfilled');

$timeout(fulfilledSpy, 1000, false);

$timeout.flush();

expect(fulfilledSpy).toHaveBeenCalledOnce();
expect(evalAsyncSpy).not.toHaveBeenCalled();
expect(digestSpy).not.toHaveBeenCalled();
}));


it('should allow you to specify the delay time', inject(function($timeout, $browser) {
var defer = spyOn($browser, 'defer');
$timeout(noop, 123);
Expand Down