Working with multiple image select

publiclab · Apr 10, 2019 · 3d8cec2 · 3d8cec2
1 parent 88b2636
commit 3d8cec2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
@@ -314,7 +314,7 @@ L.LightBoxHandle = L.EditHandle.extend({
   updateHandle: function() {
     this.setLatLng(this._handled._corners[this._corner]);
 
-    this._handled.editing._showToolbar();
+    // this._handled.editing._showToolbar();
   }
 });
 
@@ -909,6 +909,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
       var edit = layer.editing;
       if (layer._image !== event.target) {
         edit._hideMarkers();
+        edit._hideToolbar();
       } else {
         this._toggleMultiSelect(event, edit);
       }
@@ -954,7 +955,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
           layer.getCorners()[i]
         );
       }
-    });
+    }, this);
   },
 
   _dragMultiple: function(event) {
@@ -1486,7 +1487,7 @@ L.DistortableImage.Edit = L.Handler.extend({
 	},
 
 	_nextMode: function(event) {
-		var overlay = this._overlay;
+		// var overlay = this._overlay;
 		var mode = this._mode;
 		var map = this._overlay._map;
 
@@ -1495,14 +1496,11 @@ L.DistortableImage.Edit = L.Handler.extend({
 		var next = (prev + 1) % HANDLES.length;
 		map.removeLayer(this._handles[this._mode]);
 		this._mode = HANDLES[next];
-		if (this._mode !== "light") {
-			this._hideToolbar();
-		}
+		this._hideToolbar();
 		map.addLayer(this._handles[this._mode]);
 		if (this._mode === "light") {
 			this._showToolbar();
 		}
-		overlay._reset();
 
 		L.DomEvent.stopPropagation(event);
 	},

diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
@@ -54,6 +54,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
       var edit = layer.editing;
       if (layer._image !== event.target) {
         edit._hideMarkers();
+        edit._hideToolbar();
       } else {
         this._toggleMultiSelect(event, edit);
       }
@@ -99,7 +100,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
           layer.getCorners()[i]
         );
       }
-    });
+    }, this);
   },
 
   _dragMultiple: function(event) {

diff --git a/src/edit/DistortableImage.Edit.js b/src/edit/DistortableImage.Edit.js
@@ -295,7 +295,7 @@ L.DistortableImage.Edit = L.Handler.extend({
 	},
 
 	_nextMode: function(event) {
-		var overlay = this._overlay;
+		// var overlay = this._overlay;
 		var mode = this._mode;
 		var map = this._overlay._map;
 
@@ -304,14 +304,11 @@ L.DistortableImage.Edit = L.Handler.extend({
 		var next = (prev + 1) % HANDLES.length;
 		map.removeLayer(this._handles[this._mode]);
 		this._mode = HANDLES[next];
-		if (this._mode !== "light") {
-			this._hideToolbar();
-		}
+		this._hideToolbar();
 		map.addLayer(this._handles[this._mode]);
 		if (this._mode === "light") {
 			this._showToolbar();
 		}
-		overlay._reset();
 
 		L.DomEvent.stopPropagation(event);
 	},

diff --git a/src/edit/LightBoxHandle.js b/src/edit/LightBoxHandle.js
@@ -13,6 +13,6 @@ L.LightBoxHandle = L.EditHandle.extend({
   updateHandle: function() {
     this.setLatLng(this._handled._corners[this._corner]);
 
-    this._handled.editing._showToolbar();
+    // this._handled.editing._showToolbar();
   }
 });