Merge pull request #3491 from tomhughes/legacy-trace

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

diff --git a/vendor/assets/leaflet/leaflet.contextmenu.js b/vendor/assets/leaflet/leaflet.contextmenu.js
index a9b011d9519c685bafa3d66feb166e0a72294f8d..489da8755b551c9033efabaf5d9c9ac400af4f13 100644 (file)
--- a/vendor/assets/leaflet/leaflet.contextmenu.js
+++ b/vendor/assets/leaflet/leaflet.contextmenu.js
@@ -29,14 +29,14 @@ L.Map.mergeOptions({
 
 L.Map.ContextMenu = L.Handler.extend({
     _touchstart: L.Browser.msPointer ? 'MSPointerDown' : L.Browser.pointer ? 'pointerdown' : 'touchstart',
 
 L.Map.ContextMenu = L.Handler.extend({
     _touchstart: L.Browser.msPointer ? 'MSPointerDown' : L.Browser.pointer ? 'pointerdown' : 'touchstart',

-    
+

     statics: {
         BASE_CLS: 'leaflet-contextmenu'
     },
     statics: {
         BASE_CLS: 'leaflet-contextmenu'
     },

-    
+

     initialize: function (map) {
         L.Handler.prototype.initialize.call(this, map);
     initialize: function (map) {
         L.Handler.prototype.initialize.call(this, map);

-        
+

         this._items = [];
         this._visible = false;
 
         this._items = [];
         this._visible = false;
 


@@ -71,7 +71,6 @@ L.Map.ContextMenu = L.Handler.extend({
         this._map.on({
             contextmenu: this._show,
             mousedown: this._hide,
         this._map.on({
             contextmenu: this._show,
             mousedown: this._hide,

-            movestart: this._hide,

             zoomstart: this._hide
         }, this);
     },
             zoomstart: this._hide
         }, this);
     },


@@ -90,7 +89,6 @@ L.Map.ContextMenu = L.Handler.extend({
         this._map.off({
             contextmenu: this._show,
             mousedown: this._hide,
         this._map.off({
             contextmenu: this._show,
             mousedown: this._hide,

-            movestart: this._hide,

             zoomstart: this._hide
         }, this);
     },
             zoomstart: this._hide
         }, this);
     },


@@ -144,16 +142,22 @@ L.Map.ContextMenu = L.Handler.extend({
                 contextmenu: this,
                 el: item
             });
                 contextmenu: this,
                 el: item
             });

+
+            return item;

         }
         }

+
+        return null;

     },
 
     removeAllItems: function () {
     },
 
     removeAllItems: function () {

-        var item;
+        var items = this._container.children,
+            item;

 
 

-        while (this._container.children.length) {
-            item = this._container.children[0];
+        while (items.length) {
+            item = items[0];

             this._removeItem(L.Util.stamp(item));
         }
             this._removeItem(L.Util.stamp(item));
         }

+        return items;

     },
 
     hideAllItems: function () {
     },
 
     hideAllItems: function () {


@@ -314,15 +318,27 @@ L.Map.ContextMenu = L.Handler.extend({
                 return;
             }
 
                 return;
             }
 

+            var map = me._map,
+                containerPoint = me._showLocation.containerPoint,
+                layerPoint = map.containerPointToLayerPoint(containerPoint),
+                latlng = map.layerPointToLatLng(layerPoint),
+                relatedTarget = me._showLocation.relatedTarget,
+                data = {
+                  containerPoint: containerPoint,
+                  layerPoint: layerPoint,
+                  latlng: latlng,
+                  relatedTarget: relatedTarget
+                };
+

             if (hideOnSelect) {
                 me._hide();
             }
 
             if (func) {
             if (hideOnSelect) {
                 me._hide();
             }
 
             if (func) {

-                func.call(context || map, me._showLocation);
+                func.call(context || map, data);

             }
 
             }
 

-            me._map.fire('contextmenu:select', {
+            me._map.fire('contextmenu.select', {

                 contextmenu: me,
                 el: el
             });
                 contextmenu: me,
                 el: el
             });


@@ -355,13 +371,9 @@ L.Map.ContextMenu = L.Handler.extend({
     _showAtPoint: function (pt, data) {
         if (this._items.length) {
             var map = this._map,
     _showAtPoint: function (pt, data) {
         if (this._items.length) {
             var map = this._map,

-            layerPoint = map.containerPointToLayerPoint(pt),
-            latlng = map.layerPointToLatLng(layerPoint),

             event = L.extend(data || {}, {contextmenu: this});
 
             this._showLocation = {
             event = L.extend(data || {}, {contextmenu: this});
 
             this._showLocation = {

-                latlng: latlng,
-                layerPoint: layerPoint,

                 containerPoint: pt
             };
 
                 containerPoint: pt
             };