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

Only do Marker/Path zoom animation if options.zoomAnimation is on (Aka we are doing the zoom animation), be pointless otherwise ;)

Browse Source
This commit is contained in:
danzel 2012-06-21 11:15:02 +12:00
parent df07bf0ae6
commit 106228647e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/layer/marker/Marker.js
View File

@ -25,7 +25,7 @@ L.Marker = L.Class.extend({
map.on('viewreset', this._reset, this); map.on('viewreset', this._reset, this);
if (L.Browser.any3d && map.options.animateMarkerZoom) { if (map.options.zoomAnimation && map.options.animateMarkerZoom) {
map.on('zoomanim', this._zoomAnimation, this); map.on('zoomanim', this._zoomAnimation, this);
} }

2
src/layer/vector/Path.SVG.js
View File

@ -120,7 +120,7 @@ L.Map.include({
this._pathRoot = L.Path.prototype._createElement('svg'); this._pathRoot = L.Path.prototype._createElement('svg');
this._panes.overlayPane.appendChild(this._pathRoot); this._panes.overlayPane.appendChild(this._pathRoot);
if (L.Browser.any3d) { if (this.options.zoomAnimation) {
this.on('zoomanim', this._animatePathZoom); this.on('zoomanim', this._animatePathZoom);
this.on('zoomend', this._endPathZoom); this.on('zoomend', this._endPathZoom);
} }

2
src/layer/vector/canvas/Path.Canvas.js
View File

@ -119,7 +119,7 @@ L.Map.include((L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? {}
this._panes.overlayPane.appendChild(root); this._panes.overlayPane.appendChild(root);
if (L.Browser.any3d) { if (this.options.zoomAnimation) {
this.on('zoomanim', this._animatePathZoom); this.on('zoomanim', this._animatePathZoom);
this.on('zoomend', this._endZoom); this.on('zoomend', this._endZoom);
} }