Skip to content

Commit

Permalink
Fix merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
danzel committed Jun 18, 2012
1 parent da475a9 commit 9bb49ac
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/map/anim/Map.ZoomAnimation.js
Expand Up @@ -85,12 +85,6 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
options[transform] = scaleStr + ' ' + tileBg.style[transform];
}

origin = origin.subtract(this._size);
this._pathRoot.style[L.Transition.DURATION] = '0.25s';
this._pathRoot.style[L.Transition.EASING] = 'cubic-bezier(0.25,0.1,0.25,0.75)';
this._pathRoot.style[L.Transition.PROPERTY] = this._tileBg.transition._dasherize(L.DomUtil.TRANSFORM);
this._pathRoot.style[L.DomUtil.TRANSFORM] = L.DomUtil.getScaleString(scale, origin) + ' ' + this._pathRoot.style[L.DomUtil.TRANSFORM];

tileBg.transition.run(options);
},

Expand Down

0 comments on commit 9bb49ac

Please sign in to comment.