From 3d8cec29b5e53cc02307a9bec959340ef1959d50 Mon Sep 17 00:00:00 2001
From: sashadev-sky <sboginsky17@gmail.com>
Date: Wed, 10 Apr 2019 08:35:00 -0400
Subject: [PATCH] Working with multiple image select

---
 dist/leaflet.distortableimage.js  | 12 +++++-------
 src/DistortableCollection.js      |  3 ++-
 src/edit/DistortableImage.Edit.js |  7 ++-----
 src/edit/LightBoxHandle.js        |  2 +-
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
index c5271fda7..bce9721d6 100644
--- 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
index dae931afe..587b4d9e4 100644
--- 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
index 6ec01f6e0..9b9e985c5 100644
--- 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
index f1a9c40fe..9d86f43fd 100644
--- 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();
   }
 });