Merge remote-tracking branch 'openstreetmap/pull/954'

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

diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js
index aecf2677ba664db88dab18925a9771c7aedffaf0..d3d5635741c2dc68a16e0a3b72ed000ede34e3a4 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.4';
+L.version = '0.7.7';
 
 // define Leaflet for Node module pattern loaders, including Browserify
 if (typeof module === 'object' && typeof module.exports === 'object') {
@@ -520,7 +520,7 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
 
            mobile = typeof orientation !== undefined + '',
            msPointer = !window.PointerEvent && window.MSPointerEvent,
-               pointer = (window.PointerEvent && window.navigator.pointerEnabled && window.navigator.maxTouchPoints) ||
+               pointer = (window.PointerEvent && window.navigator.pointerEnabled) ||
                                  msPointer,
            retina = ('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
                     ('matchMedia' in window && window.matchMedia('(min-resolution:144dpi)') &&
@@ -3537,12 +3537,8 @@ L.Marker = L.Class.extend({
 
        update: function () {
                if (this._icon) {
-                       var pos = this._map.latLngToLayerPoint(this._latlng).round();
-                       L.Util.requestAnimFrame(function () {
-                               this._setPos(pos);
-                       }, this);
+                       this._setPos(this._map.latLngToLayerPoint(this._latlng).round());
                }
-
                return this;
        },
 
@@ -3565,7 +3561,7 @@ L.Marker = L.Class.extend({
                        if (options.title) {
                                icon.title = options.title;
                        }
-                       
+
                        if (options.alt) {
                                icon.alt = options.alt;
                        }
@@ -4393,7 +4389,9 @@ L.FeatureGroup = L.LayerGroup.extend({
                        layer = this._layers[layer];
                }
 
-               layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this);
+               if ('off' in layer) {
+                       layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this);
+               }
 
                L.LayerGroup.prototype.removeLayer.call(this, layer);
 
@@ -4713,7 +4711,7 @@ L.Path = L.Path.extend({
        },
 
        _fireMouseEvent: function (e) {
-               if (!this.hasEventListeners(e.type)) { return; }
+               if (!this._map || !this.hasEventListeners(e.type)) { return; }
 
                var map = this._map,
                    containerPoint = map.mouseEventToContainerPoint(e),
@@ -7171,8 +7169,9 @@ L.extend(L.DomEvent, {
                    pointers = this._pointers;
 
                var cb = function (e) {
-
-                       L.DomEvent.preventDefault(e);
+                       if (e.pointerType !== 'mouse' && e.pointerType !== e.MSPOINTER_TYPE_MOUSE) {
+                               L.DomEvent.preventDefault(e);
+                       }
 
                        var alreadyInArray = false;
                        for (var i = 0; i < pointers.length; i++) {
@@ -8943,11 +8942,13 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 
                L.DomUtil.removeClass(this._mapPane, 'leaflet-zoom-anim');
 
-               this._resetView(this._animateToCenter, this._animateToZoom, true, true);
+               L.Util.requestAnimFrame(function () {
+                       this._resetView(this._animateToCenter, this._animateToZoom, true, true);
 
-               if (L.Draggable) {
-                       L.Draggable._disabled = false;
-               }
+                       if (L.Draggable) {
+                               L.Draggable._disabled = false;
+                       }
+               }, this);
        }
 });