ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6206 from tschaub/zero

Browse Source 
Stop asserting that zero duration animations take time
This commit is contained in:
Tim Schaub
2016-12-05 08:59:05 -07:00
committed by GitHub
parent f6a3ec513e dfbc7bb743
commit c8064d15b7
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/view.js
+1 -1
View File
@@ -304,7 +304,7 @@ ol.View.prototype.updateAnimations_ = function() {
continue; continue;
} }
var elapsed = now - animation.start; var elapsed = now - animation.start;
var fraction = elapsed / animation.duration; var fraction = animation.duration > 0 ? elapsed / animation.duration : 1;
if (fraction >= 1) { if (fraction >= 1) {
animation.complete = true; animation.complete = true;
fraction = 1; fraction = 1;
test/spec/ol/view.test.js
-1
View File
@@ -379,7 +379,6 @@ describe('ol.View', function() {
zoom: 4, zoom: 4,
duration: 0 duration: 0
}); });
expect(view.getAnimating()).to.eql(true);
setTimeout(function() { setTimeout(function() {
expect(view.getCenter()).to.eql([0, 0]); expect(view.getCenter()).to.eql([0, 0]);