cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stopAnimation -> stop

Browse Source
This commit is contained in:
Dave Leaver 2014-03-20 10:34:31 +13:00 committed by Vladimir Agafonkin
parent a0bc81cba8
commit c1bea627b0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debug/map/zoompan.html
View File

@ -51,7 +51,7 @@
document.getElementById('dc').onclick = function () { map.zoomPanTo(dc, 10); }; document.getElementById('dc').onclick = function () { map.zoomPanTo(dc, 10); };
document.getElementById('sf').onclick = function () { map.zoomPanTo(sf, 10); }; document.getElementById('sf').onclick = function () { map.zoomPanTo(sf, 10); };
document.getElementById('stop').onclick = function () { map.stopAnimation(); }; document.getElementById('stop').onclick = function () { map.stop(); };
// document.getElementById('london').onclick = function () { map.zoomPanTo(london); }; // document.getElementById('london').onclick = function () { map.zoomPanTo(london); };
// document.getElementById('kyiv').onclick = function () { map.zoomPanTo(kyiv); }; // document.getElementById('kyiv').onclick = function () { map.zoomPanTo(kyiv); };

4
src/map/Map.js
View File

@ -196,8 +196,8 @@ L.Map = L.Evented.extend({
}); });
}, },
stopAnimation: function () { stop: function () {
//TODO: Need to know if we are in a anim so we can fire zoomend //TODO: Need to know if we are in an anim so we can fire zoomend
//zoomPan //zoomPan
L.Util.cancelAnimFrame(this._zoomPanFrame); L.Util.cancelAnimFrame(this._zoomPanFrame);

2
src/map/anim/Map.ZoomPan.js
View File

@ -2,7 +2,7 @@
L.Map.include({ L.Map.include({
zoomPanTo: function (targetCenter, targetZoom) { zoomPanTo: function (targetCenter, targetZoom) {
this.stopAnimation(); this.stop();
var from = this.project(this.getCenter()), var from = this.project(this.getCenter()),
to = this.project(targetCenter), to = this.project(targetCenter),