kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-01-12 22:45:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix($animate): prevent cancellation timestamp from being too far in the future

Browse Source 
Closes #6748
This commit is contained in:
Matias Niemelä
2014-03-21 16:32:53 -04:00
parent f552f25171
commit ff5cf736e5
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ngAnimate/animate.js
View File

@@ -1199,7 +1199,7 @@ angular.module('ngAnimate', ['ng'])
//but it may not need to cancel out the existing timeout
//if the timestamp is less than the previous one
var futureTimestamp = Date.now() + (totalTime * 1000);
var futureTimestamp = Date.now() + totalTime;
if(futureTimestamp <= closingTimestamp) {
return;
}

35
test/ngAnimate/animateSpec.js
View File

@@ -1390,13 +1390,20 @@ describe("ngAnimate", function() {
}));
it("should intelligently cancel former timeouts and close off a series of elements a final timeout", function() {
var currentTimestamp = Date.now();
spyOn(Date,'now').andCallFake(function() {
return currentTimestamp;
});
var cancellations = 0;
module(function($provide) {
$provide.decorator('$timeout', function($delegate) {
var _cancel = $delegate.cancel;
$delegate.cancel = function() {
cancellations++;
return _cancel.apply($delegate, arguments);
$delegate.cancel = function(timer) {
if(timer) {
cancellations++;
return _cancel.apply($delegate, arguments);
}
};
return $delegate;
});
@@ -1404,10 +1411,22 @@ describe("ngAnimate", function() {
inject(function($animate, $rootScope, $compile, $sniffer, $timeout) {
if (!$sniffer.transitions) return;
ss.addRule('.animate-me', '-webkit-transition:1s linear all;' +
ss.addRule('.animate-me div', '-webkit-transition:1s linear all;' +
'transition:1s linear all;');
element = $compile(html('<div><div class="animate-me" ng-repeat="item in items"></div></div>'))($rootScope);
ss.addRule('.animate-me-longer div', '-webkit-transition:1.5s linear all;' +
'transition:1.5s linear all;');
element = $compile(html('<div class="animate-me-longer">' +
' <div ng-repeat="item in items"></div>' +
'</div>'))($rootScope);
$rootScope.items = [0];
$rootScope.$digest();
$animate.triggerReflow();
currentTimestamp += 2250; //1.5 * 1500 = 2250
element[0].className = 'animate-me';
$rootScope.items = [1,2,3,4,5,6,7,8,9,10];
var totalOperations = $rootScope.items.length;
@@ -1416,9 +1435,11 @@ describe("ngAnimate", function() {
$rootScope.items = [0];
$animate.triggerReflow();
currentTimestamp += 1500; //1.5 * 1000 = 1500
$timeout.flush(1500);
expect(cancellations).toBeLessThan(totalOperations);
expect(cancellations).toBe(1);
expect(element.children().length).toBe(10);
cancellations = 0;
@@ -1428,7 +1449,7 @@ describe("ngAnimate", function() {
$animate.triggerReflow();
$timeout.flush(1500);
expect(element.children().length).toBe(1);
expect(cancellations).toBeLessThan(totalOperations);
expect(cancellations).toBe(1);
});
});