Update to Leaflet 0.7.4

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

diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js
index 4947090340a6588078c0ba8f791b05d7f3b83902..aecf2677ba664db88dab18925a9771c7aedffaf0 100644 (file)
--- a/vendor/assets/leaflet/leaflet.js
+++ b/vendor/assets/leaflet/leaflet.js
@@ -7,7 +7,7 @@
 var oldL = window.L,
     L = {};
 
-L.version = '0.7.3';
+L.version = '0.7.4';
 
 // define Leaflet for Node module pattern loaders, including Browserify
 if (typeof module === 'object' && typeof module.exports === 'object') {
@@ -519,8 +519,7 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
                gecko = ua.indexOf('gecko') !== -1,
 
            mobile = typeof orientation !== undefined + '',
-           msPointer = window.navigator && window.navigator.msPointerEnabled &&
-                     window.navigator.msMaxTouchPoints && !window.PointerEvent,
+           msPointer = !window.PointerEvent && window.MSPointerEvent,
                pointer = (window.PointerEvent && window.navigator.pointerEnabled && window.navigator.maxTouchPoints) ||
                                  msPointer,
            retina = ('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
@@ -534,38 +533,8 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
            opera3d = 'OTransition' in doc.style,
            any3d = !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d || opera3d) && !phantomjs;
 
-
-       // PhantomJS has 'ontouchstart' in document.documentElement, but doesn't actually support touch.
-       // https://github.com/Leaflet/Leaflet/pull/1434#issuecomment-13843151
-
-       var touch = !window.L_NO_TOUCH && !phantomjs && (function () {
-
-               var startName = 'ontouchstart';
-
-               // IE10+ (We simulate these into touch* events in L.DomEvent and L.DomEvent.Pointer) or WebKit, etc.
-               if (pointer || (startName in doc)) {
-                       return true;
-               }
-
-               // Firefox/Gecko
-               var div = document.createElement('div'),
-                   supported = false;
-
-               if (!div.setAttribute) {
-                       return false;
-               }
-               div.setAttribute(startName, 'return;');
-
-               if (typeof div[startName] === 'function') {
-                       supported = true;
-               }
-
-               div.removeAttribute(startName);
-               div = null;
-
-               return supported;
-       }());
-
+       var touch = !window.L_NO_TOUCH && !phantomjs && (pointer || 'ontouchstart' in window ||
+               (window.DocumentTouch && document instanceof window.DocumentTouch));
 
        L.Browser = {
                ie: ie,
@@ -1632,15 +1601,16 @@ L.Map = L.Class.extend({
                var paddingTL = L.point(options.paddingTopLeft || options.padding || [0, 0]),
                    paddingBR = L.point(options.paddingBottomRight || options.padding || [0, 0]),
 
-                   zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR)),
-                   paddingOffset = paddingBR.subtract(paddingTL).divideBy(2),
+                   zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR));
+
+               zoom = (options.maxZoom) ? Math.min(options.maxZoom, zoom) : zoom;
+
+               var paddingOffset = paddingBR.subtract(paddingTL).divideBy(2),
 
                    swPoint = this.project(bounds.getSouthWest(), zoom),
                    nePoint = this.project(bounds.getNorthEast(), zoom),
                    center = this.unproject(swPoint.add(nePoint).divideBy(2).add(paddingOffset), zoom);
 
-               zoom = options && options.maxZoom ? Math.min(options.maxZoom, zoom) : zoom;
-
                return this.setView(center, zoom, options);
        },
 
@@ -2782,7 +2752,7 @@ L.TileLayer = L.Class.extend({
                }
 
                if (options.bounds) {
-                       var tileSize = options.tileSize,
+                       var tileSize = this._getTileSize(),
                            nwPoint = tilePoint.multiplyBy(tileSize),
                            sePoint = nwPoint.add([tileSize, tileSize]),
                            nw = this._map.unproject(nwPoint),
@@ -3568,7 +3538,9 @@ L.Marker = L.Class.extend({
        update: function () {
                if (this._icon) {
                        var pos = this._map.latLngToLayerPoint(this._latlng).round();
-                       this._setPos(pos);
+                       L.Util.requestAnimFrame(function () {
+                               this._setPos(pos);
+                       }, this);
                }
 
                return this;
@@ -4228,6 +4200,7 @@ L.Marker.include({
                if (content instanceof L.Popup) {
                        L.setOptions(content, options);
                        this._popup = content;
+                       content._source = this;
                } else {
                        this._popup = new L.Popup(options, this)
                                .setContent(content);
@@ -5114,6 +5087,13 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
                if (options.fill) {
                        this._ctx.fillStyle = options.fillColor || options.color;
                }
+
+               if (options.lineCap) {
+                       this._ctx.lineCap = options.lineCap;
+               }
+               if (options.lineJoin) {
+                       this._ctx.lineJoin = options.lineJoin;
+               }
        },
 
        _drawPath: function () {
@@ -5151,7 +5131,7 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
 
                if (options.fill) {
                        ctx.globalAlpha = options.fillOpacity;
-                       ctx.fill();
+                       ctx.fill(options.fillRule || 'evenodd');
                }
 
                if (options.stroke) {
@@ -5166,15 +5146,14 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
 
        _initEvents: function () {
                if (this.options.clickable) {
-                       // TODO dblclick
                        this._map.on('mousemove', this._onMouseMove, this);
-                       this._map.on('click', this._onClick, this);
+                       this._map.on('click dblclick contextmenu', this._fireMouseEvent, this);
                }
        },
 
-       _onClick: function (e) {
+       _fireMouseEvent: function (e) {
                if (this._containsPoint(e.layerPoint)) {
-                       this.fire('click', e);
+                       this.fire(e.type, e);
                }
        },
 
@@ -8952,10 +8931,13 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
                                delta: delta,
                                backwards: backwards
                        });
+                       // horrible hack to work around a Chrome bug https://github.com/Leaflet/Leaflet/issues/3689
+                       setTimeout(L.bind(this._onZoomTransitionEnd, this), 250);
                }, this);
        },
 
        _onZoomTransitionEnd: function () {
+               if (!this._animatingZoom) { return; }
 
                this._animatingZoom = false;
 
@@ -9001,6 +8983,11 @@ L.TileLayer.include({
                // force reflow
                L.Util.falseFn(bg.offsetWidth);
 
+               var zoom = this._map.getZoom();
+               if (zoom > this.options.maxZoom || zoom < this.options.minZoom) {
+                       this._clearBgBuffer();
+               }
+
                this._animating = false;
        },