Improve pagination in changeset details

[rails.git] / vendor / assets / leaflet / leaflet.js

diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js
index 0795a7de931b2f594a96e9b9e4b495ef6e79f579..b972941d97a06cbb5705ce998d7382fa682e355c 100644 (file)
--- a/vendor/assets/leaflet/leaflet.js
+++ b/vendor/assets/leaflet/leaflet.js
@@ -7,7 +7,7 @@
 var oldL = window.L,
     L = {};
 
 var oldL = window.L,
     L = {};
 

-L.version = '0.6';
+L.version = '0.6.3';

 
 // define Leaflet for Node module pattern loaders, including Browserify
 if (typeof module === 'object' && typeof module.exports === 'object') {
 
 // define Leaflet for Node module pattern loaders, including Browserify
 if (typeof module === 'object' && typeof module.exports === 'object') {


@@ -1092,46 +1092,30 @@ L.DomUtil.TRANSITION_END =
        var userSelectProperty = L.DomUtil.testProp(
                ['userSelect', 'WebkitUserSelect', 'OUserSelect', 'MozUserSelect', 'msUserSelect']);
 
        var userSelectProperty = L.DomUtil.testProp(
                ['userSelect', 'WebkitUserSelect', 'OUserSelect', 'MozUserSelect', 'msUserSelect']);
 

-       var userDragProperty = L.DomUtil.testProp(
-               ['userDrag', 'WebkitUserDrag', 'OUserDrag', 'MozUserDrag', 'msUserDrag']);
-

        L.extend(L.DomUtil, {
                disableTextSelection: function () {
        L.extend(L.DomUtil, {
                disableTextSelection: function () {

+                       L.DomEvent.on(window, 'selectstart', L.DomEvent.preventDefault);

                        if (userSelectProperty) {
                                var style = document.documentElement.style;
                                this._userSelect = style[userSelectProperty];
                                style[userSelectProperty] = 'none';
                        if (userSelectProperty) {
                                var style = document.documentElement.style;
                                this._userSelect = style[userSelectProperty];
                                style[userSelectProperty] = 'none';

-                       } else {
-                               L.DomEvent.on(window, 'selectstart', L.DomEvent.stop);

                        }
                },
 
                enableTextSelection: function () {
                        }
                },
 
                enableTextSelection: function () {

+                       L.DomEvent.off(window, 'selectstart', L.DomEvent.preventDefault);

                        if (userSelectProperty) {
                                document.documentElement.style[userSelectProperty] = this._userSelect;
                                delete this._userSelect;
                        if (userSelectProperty) {
                                document.documentElement.style[userSelectProperty] = this._userSelect;
                                delete this._userSelect;

-                       } else {
-                               L.DomEvent.off(window, 'selectstart', L.DomEvent.stop);

                        }
                },
 
                disableImageDrag: function () {
                        }
                },
 
                disableImageDrag: function () {

-                       if (userDragProperty) {
-                               var style = document.documentElement.style;
-                               this._userDrag = style[userDragProperty];
-                               style[userDragProperty] = 'none';
-                       } else {
-                               L.DomEvent.on(window, 'dragstart', L.DomEvent.stop);
-                       }
+                       L.DomEvent.on(window, 'dragstart', L.DomEvent.preventDefault);

                },
 
                enableImageDrag: function () {
                },
 
                enableImageDrag: function () {

-                       if (userDragProperty) {
-                               document.documentElement.style[userDragProperty] = this._userDrag;
-                               delete this._userDrag;
-                       } else {
-                               L.DomEvent.off(window, 'dragstart', L.DomEvent.stop);
-                       }
+                       L.DomEvent.off(window, 'dragstart', L.DomEvent.preventDefault);

                }
        });
 })();
                }
        });
 })();


@@ -1629,7 +1613,7 @@ L.Map = L.Class.extend({
                return this.fire('moveend');
        },
 
                return this.fire('moveend');
        },
 

-       setMaxBounds: function (bounds) {
+       setMaxBounds: function (bounds, options) {

                bounds = L.latLngBounds(bounds);
 
                this.options.maxBounds = bounds;
                bounds = L.latLngBounds(bounds);
 
                this.options.maxBounds = bounds;


@@ -1646,7 +1630,7 @@ L.Map = L.Class.extend({
 
                if (this._loaded) {
                        if (this._zoom < minZoom) {
 
                if (this._loaded) {
                        if (this._zoom < minZoom) {

-                               this.setView(bounds.getCenter(), minZoom);
+                               this.setView(bounds.getCenter(), minZoom, options);

                        } else {
                                this.panInsideBounds(bounds);
                        }
                        } else {
                                this.panInsideBounds(bounds);
                        }


@@ -1724,10 +1708,14 @@ L.Map = L.Class.extend({
 
                if (this._loaded) {
                        layer.onRemove(this);
 
                if (this._loaded) {
                        layer.onRemove(this);

-                       this.fire('layerremove', {layer: layer});

                }
 
                delete this._layers[id];
                }
 
                delete this._layers[id];

+
+               if (this._loaded) {
+                       this.fire('layerremove', {layer: layer});
+               }
+

                if (this._zoomBoundLayers[id]) {
                        delete this._zoomBoundLayers[id];
                        this._updateZoomLevels();
                if (this._zoomBoundLayers[id]) {
                        delete this._zoomBoundLayers[id];
                        this._updateZoomLevels();


@@ -1764,6 +1752,7 @@ L.Map = L.Class.extend({
 
                var oldSize = this.getSize();
                this._sizeChanged = true;
 
                var oldSize = this.getSize();
                this._sizeChanged = true;

+               this._initialCenter = null;

 
                if (this.options.maxBounds) {
                        this.setMaxBounds(this.options.maxBounds);
 
                if (this.options.maxBounds) {
                        this.setMaxBounds(this.options.maxBounds);


@@ -1837,7 +1826,7 @@ L.Map = L.Class.extend({
        getCenter: function () { // (Boolean) -> LatLng
                this._checkIfLoaded();
 
        getCenter: function () { // (Boolean) -> LatLng
                this._checkIfLoaded();
 

-               if (!this._moved()) {
+               if (this._initialCenter && !this._moved()) {

                        return this._initialCenter;
                }
                return this.layerPointToLatLng(this._getCenterLayerPoint());
                        return this._initialCenter;
                }
                return this.layerPointToLatLng(this._getCenterLayerPoint());


@@ -1856,18 +1845,15 @@ L.Map = L.Class.extend({
        },
 
        getMinZoom: function () {
        },
 
        getMinZoom: function () {

-               var z1 = this.options.minZoom || 0,
-                   z2 = this._layersMinZoom || 0,
-                   z3 = this._boundsMinZoom || 0;
-
-               return Math.max(z1, z2, z3);
+               var z1 = this._layersMinZoom === undefined ? -Infinity : this._layersMinZoom,
+                   z2 = this._boundsMinZoom === undefined ? -Infinity : this._boundsMinZoom;
+               return this.options.minZoom === undefined ? Math.max(z1, z2) : this.options.minZoom;

        },
 
        getMaxZoom: function () {
        },
 
        getMaxZoom: function () {

-               var z1 = this.options.maxZoom === undefined ? Infinity : this.options.maxZoom,
-                   z2 = this._layersMaxZoom  === undefined ? Infinity : this._layersMaxZoom;
-
-               return Math.min(z1, z2);
+               return this.options.maxZoom === undefined ?
+                       (this._layersMaxZoom === undefined ? Infinity : this._layersMaxZoom) :
+                       this.options.maxZoom;

        },
 
        getBoundsZoom: function (bounds, inside, padding) { // (LatLngBounds[, Boolean, Point]) -> Number
        },
 
        getBoundsZoom: function (bounds, inside, padding) { // (LatLngBounds[, Boolean, Point]) -> Number


@@ -2187,16 +2173,15 @@ L.Map = L.Class.extend({
        },
 
        _onMouseClick: function (e) {
        },
 
        _onMouseClick: function (e) {

-               // jshint camelcase: false
-               if (!this._loaded || (!e._simulated && this.dragging && this.dragging.moved()) || e._leaflet_stop) { return; }
+               if (!this._loaded || (!e._simulated && this.dragging && this.dragging.moved()) ||
+                       L.DomEvent._skipped(e)) { return; }

 
                this.fire('preclick');
                this._fireMouseEvent(e);
        },
 
        _fireMouseEvent: function (e) {
 
                this.fire('preclick');
                this._fireMouseEvent(e);
        },
 
        _fireMouseEvent: function (e) {

-               // jshint camelcase: false
-               if (!this._loaded || e._leaflet_stop) { return; }
+               if (!this._loaded || L.DomEvent._skipped(e)) { return; }

 
                var type = e.type;
 
 
                var type = e.type;
 


@@ -2335,7 +2320,7 @@ L.Projection.Mercator = {
                    lng = point.x * d / r,
                    tmp = r2 / r,
                    eccent = Math.sqrt(1 - (tmp * tmp)),
                    lng = point.x * d / r,
                    tmp = r2 / r,
                    eccent = Math.sqrt(1 - (tmp * tmp)),

-                   ts = Math.exp(- point.y / r2),
+                   ts = Math.exp(- point.y / r),

                    phi = (Math.PI / 2) - 2 * Math.atan(ts),
                    numIter = 15,
                    tol = 1e-7,
                    phi = (Math.PI / 2) - 2 * Math.atan(ts),
                    numIter = 15,
                    tol = 1e-7,


@@ -2606,10 +2591,7 @@ L.TileLayer = L.Class.extend({
                                var className = 'leaflet-tile-container leaflet-zoom-animated';
 
                                this._bgBuffer = L.DomUtil.create('div', className, this._container);
                                var className = 'leaflet-tile-container leaflet-zoom-animated';
 
                                this._bgBuffer = L.DomUtil.create('div', className, this._container);

-                               this._bgBuffer.style.zIndex = 1;
-

                                this._tileContainer = L.DomUtil.create('div', className, this._container);
                                this._tileContainer = L.DomUtil.create('div', className, this._container);

-                               this._tileContainer.style.zIndex = 2;

 
                        } else {
                                this._tileContainer = this._container;
 
                        } else {
                                this._tileContainer = this._container;


@@ -3049,6 +3031,11 @@ L.TileLayer.Canvas = L.TileLayer.extend({
        },
 
        redraw: function () {
        },
 
        redraw: function () {

+               if (this._map) {
+                       this._reset({hard: true});
+                       this._update();
+               }
+               

                for (var i in this._tiles) {
                        this._redrawTile(this._tiles[i]);
                }
                for (var i in this._tiles) {
                        this._redrawTile(this._tiles[i]);
                }


@@ -3538,10 +3525,10 @@ L.Marker = L.Class.extend({
                if (newShadow !== this._shadow) {
                        this._removeShadow();
                        addShadow = true;
                if (newShadow !== this._shadow) {
                        this._removeShadow();
                        addShadow = true;

+               }

 
 

-                       if (newShadow) {
-                               L.DomUtil.addClass(newShadow, classToAdd);
-                       }
+               if (newShadow) {
+                       L.DomUtil.addClass(newShadow, classToAdd);

                }
                this._shadow = newShadow;
 
                }
                this._shadow = newShadow;
 


@@ -3679,6 +3666,8 @@ L.Marker = L.Class.extend({
                if (this._map) {
                        this._updateOpacity();
                }
                if (this._map) {
                        this._updateOpacity();
                }

+               
+               return this;

        },
 
        _updateOpacity: function () {
        },
 
        _updateOpacity: function () {


@@ -3903,7 +3892,8 @@ L.Popup = L.Class.extend({
                L.DomEvent.disableClickPropagation(wrapper);
 
                this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);
                L.DomEvent.disableClickPropagation(wrapper);
 
                this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);

-               L.DomEvent.on(this._contentNode, 'wheel', L.DomEvent.stopPropagation);
+               L.DomEvent.on(this._contentNode, 'mousewheel', L.DomEvent.stopPropagation);
+               L.DomEvent.on(this._contentNode, 'MozMousePixelScroll', L.DomEvent.stopPropagation);

                L.DomEvent.on(wrapper, 'contextmenu', L.DomEvent.stopPropagation);
                this._tipContainer = L.DomUtil.create('div', prefix + '-tip-container', container);
                this._tip = L.DomUtil.create('div', prefix + '-tip', this._tipContainer);
                L.DomEvent.on(wrapper, 'contextmenu', L.DomEvent.stopPropagation);
                this._tipContainer = L.DomUtil.create('div', prefix + '-tip-container', container);
                this._tip = L.DomUtil.create('div', prefix + '-tip', this._tipContainer);


@@ -4304,6 +4294,9 @@ L.FeatureGroup = L.LayerGroup.extend({
        },
 
        removeLayer: function (layer) {
        },
 
        removeLayer: function (layer) {

+               if (!this.hasLayer(layer)) {
+                       return this;
+               }

                if (layer in this._layers) {
                        layer = this._layers[layer];
                }
                if (layer in this._layers) {
                        layer = this._layers[layer];
                }


@@ -4373,9 +4366,11 @@ L.Path = L.Class.extend({
                // how much to extend the clip area around the map view
                // (relative to its size, e.g. 0.5 is half the screen in each direction)
                // set it so that SVG element doesn't exceed 1280px (vectors flicker on dragend if it is)
                // how much to extend the clip area around the map view
                // (relative to its size, e.g. 0.5 is half the screen in each direction)
                // set it so that SVG element doesn't exceed 1280px (vectors flicker on dragend if it is)

-               CLIP_PADDING: L.Browser.mobile ?
-                       Math.max(0, Math.min(0.5,
-                               (1280 / Math.max(window.innerWidth, window.innerHeight) - 1) / 2)) : 0.5
+               CLIP_PADDING: (function () {
+                       var max = L.Browser.mobile ? 1280 : 2000,
+                           target = (max / Math.max(window.outerWidth, window.outerHeight) - 1) / 2;
+                       return Math.max(0, Math.min(0.5, target));
+               })()

        },
 
        options: {
        },
 
        options: {


@@ -5635,6 +5630,16 @@ L.polygon = function (latlngs, options) {
                                }
 
                                return this;
                                }
 
                                return this;

+                       },
+
+                       getLatLngs: function () {
+                               var latlngs = [];
+
+                               this.eachLayer(function (layer) {
+                                       latlngs.push(layer.getLatLngs());
+                               });
+
+                               return latlngs;

                        }
                });
        }
                        }
                });
        }


@@ -5936,12 +5941,13 @@ L.GeoJSON = L.FeatureGroup.extend({
 
        addData: function (geojson) {
                var features = L.Util.isArray(geojson) ? geojson : geojson.features,
 
        addData: function (geojson) {
                var features = L.Util.isArray(geojson) ? geojson : geojson.features,

-                   i, len;
+                   i, len, feature;

 
                if (features) {
                        for (i = 0, len = features.length; i < len; i++) {
                                // Only add this if geometry or geometries are set and not null
 
                if (features) {
                        for (i = 0, len = features.length; i < len; i++) {
                                // Only add this if geometry or geometries are set and not null

-                               if (features[i].geometries || features[i].geometry || features[i].features) {
+                               feature = features[i];
+                               if (feature.geometries || feature.geometry || feature.features || feature.coordinates) {

                                        this.addData(features[i]);
                                }
                        }
                                        this.addData(features[i]);
                                }
                        }


@@ -6190,11 +6196,6 @@ L.geoJson = function (geojson, options) {
  */
 
 L.DomEvent = {
  */
 
 L.DomEvent = {

-       WHEEL:
-               'onwheel' in document ? 'wheel' :
-               'onmousewheel' in document ? 'mousewheel' :
-                       'MozMousePixelScroll',
-

        /* inspired by John Resig, Dean Edwards and YUI addEvent implementations */
        addListener: function (obj, type, fn, context) { // (HTMLElement, String, Function[, Object])
 
        /* inspired by John Resig, Dean Edwards and YUI addEvent implementations */
        addListener: function (obj, type, fn, context) { // (HTMLElement, String, Function[, Object])
 


@@ -6215,13 +6216,13 @@ L.DomEvent = {
                        this.addDoubleTapListener(obj, handler, id);
                }
 
                        this.addDoubleTapListener(obj, handler, id);
                }
 

-               if (type === 'wheel' || type === 'mousewheel') {
-                       type = L.DomEvent.WHEEL;
-               }
-

                if ('addEventListener' in obj) {
 
                if ('addEventListener' in obj) {
 

-                       if ((type === 'mouseenter') || (type === 'mouseleave')) {
+                       if (type === 'mousewheel') {
+                               obj.addEventListener('DOMMouseScroll', handler, false);
+                               obj.addEventListener(type, handler, false);
+
+                       } else if ((type === 'mouseenter') || (type === 'mouseleave')) {

 
                                originalHandler = handler;
                                newType = (type === 'mouseenter' ? 'mouseover' : 'mouseout');
 
                                originalHandler = handler;
                                newType = (type === 'mouseenter' ? 'mouseover' : 'mouseout');


@@ -6261,10 +6262,6 @@ L.DomEvent = {
 
                if (!handler) { return this; }
 
 
                if (!handler) { return this; }
 

-               if (type === 'wheel' || type === 'mousewheel') {
-                       type = L.DomEvent.WHEEL;
-               }
-

                if (L.Browser.msTouch && type.indexOf('touch') === 0) {
                        this.removeMsTouchListener(obj, type, id);
                } else if (L.Browser.touch && (type === 'dblclick') && this.removeDoubleTapListener) {
                if (L.Browser.msTouch && type.indexOf('touch') === 0) {
                        this.removeMsTouchListener(obj, type, id);
                } else if (L.Browser.touch && (type === 'dblclick') && this.removeDoubleTapListener) {


@@ -6272,7 +6269,11 @@ L.DomEvent = {
 
                } else if ('removeEventListener' in obj) {
 
 
                } else if ('removeEventListener' in obj) {
 

-                       if ((type === 'mouseenter') || (type === 'mouseleave')) {
+                       if (type === 'mousewheel') {
+                               obj.removeEventListener('DOMMouseScroll', handler, false);
+                               obj.removeEventListener(type, handler, false);
+
+                       } else if ((type === 'mouseenter') || (type === 'mouseleave')) {

                                obj.removeEventListener((type === 'mouseenter' ? 'mouseover' : 'mouseout'), handler, false);
                        } else {
                                obj.removeEventListener(type, handler, false);
                                obj.removeEventListener((type === 'mouseenter' ? 'mouseover' : 'mouseout'), handler, false);
                        } else {
                                obj.removeEventListener(type, handler, false);


@@ -6324,33 +6325,57 @@ L.DomEvent = {
 
        getMousePosition: function (e, container) {
 
 
        getMousePosition: function (e, container) {
 

-               var body = document.body,
+               var ie7 = L.Browser.ie7,
+                   body = document.body,

                    docEl = document.documentElement,
                    docEl = document.documentElement,

-                   x = e.pageX ? e.pageX : e.clientX + body.scrollLeft + docEl.scrollLeft,
-                   y = e.pageY ? e.pageY : e.clientY + body.scrollTop + docEl.scrollTop,
-                   pos = new L.Point(x, y);
+                   x = e.pageX ? e.pageX - body.scrollLeft - docEl.scrollLeft: e.clientX,
+                   y = e.pageY ? e.pageY - body.scrollTop - docEl.scrollTop: e.clientY,
+                   pos = new L.Point(x, y),
+                   rect = container.getBoundingClientRect(),
+                   left = rect.left - container.clientLeft,
+                   top = rect.top - container.clientTop;
+
+               // webkit (and ie <= 7) handles RTL scrollLeft different to everyone else
+               // https://code.google.com/p/closure-library/source/browse/trunk/closure/goog/style/bidi.js
+               if (!L.DomUtil.documentIsLtr() && (L.Browser.webkit || ie7)) {
+                       left += container.scrollWidth - container.clientWidth;
+
+                       // ie7 shows the scrollbar by default and provides clientWidth counting it, so we
+                       // need to add it back in if it is visible; scrollbar is on the left as we are RTL
+                       if (ie7 && L.DomUtil.getStyle(container, 'overflow-y') !== 'hidden' &&
+                                  L.DomUtil.getStyle(container, 'overflow') !== 'hidden') {
+                               left += 17;
+                       }
+               }

 
 

-               return (container ? pos._subtract(L.DomUtil.getViewportOffset(container)) : pos);
+               return pos._subtract(new L.Point(left, top));

        },
 
        getWheelDelta: function (e) {
        },
 
        getWheelDelta: function (e) {

+

                var delta = 0;
 
                var delta = 0;
 

-               if (e.type === 'wheel') {
-                       delta = -e.deltaY / (e.deltaMode ? 1 : 120);
-               } else if (e.type === 'mousewheel') {
+               if (e.wheelDelta) {

                        delta = e.wheelDelta / 120;
                        delta = e.wheelDelta / 120;

-               } else if (e.type === 'MozMousePixelScroll') {
-                       delta = -e.detail;

                }
                }

-
+               if (e.detail) {
+                       delta = -e.detail / 3;
+               }

                return delta;
        },
 
                return delta;
        },
 

-       _fakeStop: function stop(e) {
-               // fakes stopPropagation by setting a special event flag checked in Map mouse events handler
-               // jshint camelcase: false
-               e._leaflet_stop = true;
+       _skipEvents: {},
+
+       _fakeStop: function (e) {
+               // fakes stopPropagation by setting a special event flag, checked/reset with L.DomEvent._skipped(e)
+               L.DomEvent._skipEvents[e.type] = true;
+       },
+
+       _skipped: function (e) {
+               var skipped = this._skipEvents[e.type];
+               // reset when checking, as it's only used in map container and propagates outside of the map
+               this._skipEvents[e.type] = false;
+               return skipped;

        },
 
        // check if element really left/entered the event target (for mouseenter/mouseleave)
        },
 
        // check if element really left/entered the event target (for mouseenter/mouseleave)


@@ -6466,6 +6491,7 @@ L.Draggable = L.Class.extend({
                if (L.Draggable._disabled) { return; }
 
                L.DomUtil.disableImageDrag();
                if (L.Draggable._disabled) { return; }
 
                L.DomUtil.disableImageDrag();

+               L.DomUtil.disableTextSelection();

 
                var first = e.touches ? e.touches[0] : e,
                    el = first.target;
 
                var first = e.touches ? e.touches[0] : e,
                    el = first.target;


@@ -6505,7 +6531,6 @@ L.Draggable = L.Class.extend({
                        this._startPos = L.DomUtil.getPosition(this._element).subtract(offset);
 
                        if (!L.Browser.touch) {
                        this._startPos = L.DomUtil.getPosition(this._element).subtract(offset);
 
                        if (!L.Browser.touch) {

-                               L.DomUtil.disableTextSelection();

                                L.DomUtil.addClass(document.body, 'leaflet-dragging');
                        }
                }
                                L.DomUtil.addClass(document.body, 'leaflet-dragging');
                        }
                }


@@ -6525,7 +6550,6 @@ L.Draggable = L.Class.extend({
 
        _onUp: function () {
                if (!L.Browser.touch) {
 
        _onUp: function () {
                if (!L.Browser.touch) {

-                       L.DomUtil.enableTextSelection();

                        L.DomUtil.removeClass(document.body, 'leaflet-dragging');
                }
 
                        L.DomUtil.removeClass(document.body, 'leaflet-dragging');
                }
 


@@ -6536,6 +6560,7 @@ L.Draggable = L.Class.extend({
                }
 
                L.DomUtil.enableImageDrag();
                }
 
                L.DomUtil.enableImageDrag();

+               L.DomUtil.enableTextSelection();

 
                if (this._moved) {
                        // ensure drag is not fired after dragend
 
                if (this._moved) {
                        // ensure drag is not fired after dragend


@@ -6612,6 +6637,8 @@ L.Map.Drag = L.Handler.extend({
                        if (map.options.worldCopyJump) {
                                this._draggable.on('predrag', this._onPreDrag, this);
                                map.on('viewreset', this._onViewReset, this);
                        if (map.options.worldCopyJump) {
                                this._draggable.on('predrag', this._onPreDrag, this);
                                map.on('viewreset', this._onViewReset, this);

+
+                               this._onViewReset();

                        }
                }
                this._draggable.enable();
                        }
                }
                this._draggable.enable();


@@ -6739,15 +6766,22 @@ L.Map.mergeOptions({
 
 L.Map.DoubleClickZoom = L.Handler.extend({
        addHooks: function () {
 
 L.Map.DoubleClickZoom = L.Handler.extend({
        addHooks: function () {

-               this._map.on('dblclick', this._onDoubleClick);
+               this._map.on('dblclick', this._onDoubleClick, this);

        },
 
        removeHooks: function () {
        },
 
        removeHooks: function () {

-               this._map.off('dblclick', this._onDoubleClick);
+               this._map.off('dblclick', this._onDoubleClick, this);

        },
 
        _onDoubleClick: function (e) {
        },
 
        _onDoubleClick: function (e) {

-               this.setZoomAround(e.containerPoint, this._zoom + 1);
+               var map = this._map,
+                   zoom = map.getZoom() + 1;
+
+               if (map.options.doubleClickZoom === 'center') {
+                       map.setZoom(zoom);
+               } else {
+                       map.setZoomAround(e.containerPoint, zoom);
+               }

        }
 });
 
        }
 });
 


@@ -6764,12 +6798,14 @@ L.Map.mergeOptions({
 
 L.Map.ScrollWheelZoom = L.Handler.extend({
        addHooks: function () {
 
 L.Map.ScrollWheelZoom = L.Handler.extend({
        addHooks: function () {

-               L.DomEvent.on(this._map._container, 'wheel', this._onWheelScroll, this);
+               L.DomEvent.on(this._map._container, 'mousewheel', this._onWheelScroll, this);
+               L.DomEvent.on(this._map._container, 'MozMousePixelScroll', L.DomEvent.preventDefault);

                this._delta = 0;
        },
 
        removeHooks: function () {
                this._delta = 0;
        },
 
        removeHooks: function () {

-               L.DomEvent.off(this._map._container, 'wheel', this._onWheelScroll);
+               L.DomEvent.off(this._map._container, 'mousewheel', this._onWheelScroll);
+               L.DomEvent.off(this._map._container, 'MozMousePixelScroll', L.DomEvent.preventDefault);

        },
 
        _onWheelScroll: function (e) {
        },
 
        _onWheelScroll: function (e) {


@@ -6805,7 +6841,11 @@ L.Map.ScrollWheelZoom = L.Handler.extend({
 
                if (!delta) { return; }
 
 
                if (!delta) { return; }
 

-               map.setZoomAround(this._lastMousePos, zoom + delta);
+               if (map.options.scrollWheelZoom === 'center') {
+                       map.setZoom(zoom + delta);
+               } else {
+                       map.setZoomAround(this._lastMousePos, zoom + delta);
+               }

        }
 });
 
        }
 });
 


@@ -8128,7 +8168,7 @@ L.Control.Layers = L.Control.extend({
 
                if (!L.Browser.touch) {
                        L.DomEvent.disableClickPropagation(container);
 
                if (!L.Browser.touch) {
                        L.DomEvent.disableClickPropagation(container);

-                       L.DomEvent.on(container, 'wheel', L.DomEvent.stopPropagation);
+                       L.DomEvent.on(container, 'mousewheel', L.DomEvent.stopPropagation);

                } else {
                        L.DomEvent.on(container, 'click', L.DomEvent.stopPropagation);
                }
                } else {
                        L.DomEvent.on(container, 'click', L.DomEvent.stopPropagation);
                }


@@ -8344,9 +8384,14 @@ L.PosAnimation = L.Class.extend({
        },
 
        _onStep: function () {
        },
 
        _onStep: function () {

+               var stepPos = this._getPos();
+               if (!stepPos) {
+                       this._onTransitionEnd();
+                       return;
+               }

                // jshint camelcase: false
                // make L.DomUtil.getPosition return intermediate position value during animation
                // jshint camelcase: false
                // make L.DomUtil.getPosition return intermediate position value during animation

-               this._el._leaflet_pos = this._getPos();
+               this._el._leaflet_pos = stepPos;

 
                this.fire('step');
        },
 
                this.fire('step');
        },


@@ -8363,8 +8408,9 @@ L.PosAnimation = L.Class.extend({
 
                if (L.Browser.any3d) {
                        matches = style[L.DomUtil.TRANSFORM].match(this._transformRe);
 
                if (L.Browser.any3d) {
                        matches = style[L.DomUtil.TRANSFORM].match(this._transformRe);

-                       left = matches ? parseFloat(matches[1]) : 0;
-                       top  = matches ? parseFloat(matches[2]) : 0;
+                       if (!matches) { return; }
+                       left = parseFloat(matches[1]);
+                       top  = parseFloat(matches[2]);

                } else {
                        left = parseFloat(style.left);
                        top  = parseFloat(style.top);
                } else {
                        left = parseFloat(style.left);
                        top  = parseFloat(style.top);


@@ -8594,6 +8640,10 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
                }
        },
 
                }
        },
 

+       _nothingToAnimate: function () {
+               return !this._container.getElementsByClassName('leaflet-zoom-animated').length;
+       },
+

        _tryAnimatedZoom: function (center, zoom, options) {
 
                if (this._animatingZoom) { return true; }
        _tryAnimatedZoom: function (center, zoom, options) {
 
                if (this._animatingZoom) { return true; }


@@ -8601,7 +8651,7 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
                options = options || {};
 
                // don't animate if disabled, not supported or zoom difference is too large
                options = options || {};
 
                // don't animate if disabled, not supported or zoom difference is too large

-               if (!this._zoomAnimated || options.animate === false ||
+               if (!this._zoomAnimated || options.animate === false || this._nothingToAnimate() ||

                        Math.abs(zoom - this._zoom) > this.options.zoomAnimationThreshold) { return false; }
 
                // offset is the pixel coords of the zoom origin relative to the current center
                        Math.abs(zoom - this._zoom) > this.options.zoomAnimationThreshold) { return false; }
 
                // offset is the pixel coords of the zoom origin relative to the current center


@@ -8668,28 +8718,13 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 
 L.TileLayer.include({
        _animateZoom: function (e) {
 
 L.TileLayer.include({
        _animateZoom: function (e) {

-               var firstFrame = false;
-

                if (!this._animating) {
                        this._animating = true;
                if (!this._animating) {
                        this._animating = true;

-                       firstFrame = true;
-               }
-
-               if (firstFrame) {

                        this._prepareBgBuffer();
                }
 
                        this._prepareBgBuffer();
                }
 

-               var bg = this._bgBuffer;
-
-               if (firstFrame) {
-                       //prevent bg buffer from clearing right after zoom
-                       clearTimeout(this._clearBgBufferTimer);
-
-                       // hack to make sure transform is updated before running animation
-                       L.Util.falseFn(bg.offsetWidth);
-               }
-
-               var transform = L.DomUtil.TRANSFORM,
+               var bg = this._bgBuffer,
+                   transform = L.DomUtil.TRANSFORM,

                    initialTransform = e.delta ? L.DomUtil.getTranslateString(e.delta) : bg.style[transform],
                    scaleStr = L.DomUtil.getScaleString(e.scale, e.origin);
 
                    initialTransform = e.delta ? L.DomUtil.getTranslateString(e.delta) : bg.style[transform],
                    scaleStr = L.DomUtil.getScaleString(e.scale, e.origin);
 


@@ -8703,9 +8738,7 @@ L.TileLayer.include({
                    bg = this._bgBuffer;
 
                front.style.visibility = '';
                    bg = this._bgBuffer;
 
                front.style.visibility = '';

-               front.style.zIndex = 2;
-
-               bg.style.zIndex = 1;
+               front.parentNode.appendChild(front); // Bring to fore

 
                // force reflow
                L.Util.falseFn(bg.offsetWidth);
 
                // force reflow
                L.Util.falseFn(bg.offsetWidth);


@@ -8749,6 +8782,9 @@ L.TileLayer.include({
                bg = this._bgBuffer = front;
 
                this._stopLoadingImages(bg);
                bg = this._bgBuffer = front;
 
                this._stopLoadingImages(bg);

+
+               //prevent bg buffer from clearing right after zoom
+               clearTimeout(this._clearBgBufferTimer);

        },
 
        _getLoadedTilesPercentage: function (container) {
        },
 
        _getLoadedTilesPercentage: function (container) {


@@ -8868,7 +8904,7 @@ L.Map.include({
 
                var data = {
                        latlng: latlng,
 
                var data = {
                        latlng: latlng,

-                       bounds: bounds,
+                       bounds: bounds

                };
 
                for (var i in pos.coords) {
                };
 
                for (var i in pos.coords) {