add code accidentally removed during rebase

publiclab · Apr 20, 2019 · b0b6405 · b0b6405
1 parent cd20f65
commit b0b6405
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 104 deletions.
diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
@@ -366,8 +366,6 @@ L.RotateAndScaleHandle = L.EditHandle.extend({
 			angle = this._calculateAngle(formerLatLng, newLatLng),
 			scale = this._calculateScalingFactor(formerLatLng, newLatLng);
 
-		overlay.editing._hideToolbar();
-
 		overlay.editing._rotateBy(angle);
 
 		/* 
@@ -385,6 +383,8 @@ L.RotateAndScaleHandle = L.EditHandle.extend({
 
 		overlay.fire('update');
 
+		this._handled.editing._showToolbar();
+
 	},
 
 	updateHandle: function() {
@@ -444,11 +444,11 @@ L.RotateHandle = L.EditHandle.extend({
 			newLatLng = this.getLatLng(),
 			angle = this._calculateAngle(formerLatLng, newLatLng);
 
-		overlay.editing._hideToolbar();
-
 	 	overlay.editing._rotateBy(angle);
 
 		overlay.fire('update');
+
+		this._handled.editing._showToolbar();
 	},
 
 	updateHandle: function() {
@@ -512,6 +512,8 @@ L.ScaleHandle = L.EditHandle.extend({
 		overlay.editing._scaleBy(scale);
 
 		overlay.fire('update');
+
+		this._handled.editing._showToolbar();
 	},
 
 	updateHandle: function() {
@@ -1041,7 +1043,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
           layer.editing._hideToolbar();
         }
         layer._dragStartPoints[i] = layer._map.latLngToLayerPoint(
-          layer.getCorners()[i]
+          layer.getCorner(i)
         );
       }
     });
@@ -1057,7 +1059,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
     overlay._dragPoints = {};
 
     for (i = 0; i < 4; i++) {
-      overlay._dragPoints[i] = map.latLngToLayerPoint(overlay.getCorners()[i]);
+      overlay._dragPoints[i] = map.latLngToLayerPoint(overlay.getCorner(i));
     }
 
     var cpd = overlay._calcCornerPointDelta();
@@ -1421,20 +1423,13 @@ L.DistortableImage.Edit = L.Handler.extend({
     // L.DomEvent.off(map, "zoomstart", this._handleZoomStart, this);
     // L.DomEvent.off(map, "zoomend", this._handleZoomEnd, this);
     L.DomEvent.off(overlay._image, "click", this._select, this);
-    // L.DomEvent.off(overlay._image, "dblclick", this._toolbarSendDown, this);
 
     // First, check if dragging exists - it may be off due to locking
-    if (this.dragging) {
-      this.dragging.disable();
-    }
+    if (this.dragging) { this.dragging.disable(); }
     delete this.dragging;
 
-    if (this.toolbar) {
-      this._hideToolbar();
-    }
-    if (this.editing) {
-      this.editing.disable();
-    }
+    if (this.toolbar) { this._hideToolbar(); }
+    if (this.editing) { this.editing.disable(); }
 
     map.removeLayer(this._handles[this._mode]);
 
@@ -1519,14 +1514,10 @@ L.DistortableImage.Edit = L.Handler.extend({
     this.dragging.enable();
 
     /* Hide toolbars and markers while dragging; click will re-show it */
-    this.dragging.on(
-      "dragstart",
-      function() {
-        overlay.fire("dragstart");
-        this._hideToolbar();
-      },
-      this
-    );
+    this.dragging.on("dragstart", function() {
+      overlay.fire("dragstart");
+      this._hideToolbar();
+    },this);
 
     /*
      * Adjust default behavior of L.Draggable.
@@ -1545,7 +1536,8 @@ L.DistortableImage.Edit = L.Handler.extend({
       for (i = 0; i < 4; i++) {
         currentPoint = map.latLngToLayerPoint(overlay._corners[i]);
         overlay._corners[i] = map.layerPointToLatLng(currentPoint.add(delta));
-      }
+			}
+
       overlay._reset();
       overlay.fire("update");
       overlay.fire("drag");
@@ -1558,10 +1550,7 @@ L.DistortableImage.Edit = L.Handler.extend({
     var keymap = this.options.keymap,
       handlerName = keymap[event.which];
 
-    if (
-      handlerName !== undefined &&
-      this._overlay.options.suppressToolbar !== true
-    ) {
+    if (handlerName !== undefined && this._overlay.options.suppressToolbar !== true) {
       this[handlerName].call(this);
     }
   },
@@ -1572,43 +1561,39 @@ L.DistortableImage.Edit = L.Handler.extend({
     map.removeLayer(this._handles[this._mode]);
 
     /* Switch mode. */
-    if (this._mode === "rotate") {
-      this._mode = "distort";
-    } else {
-      this._mode = "rotate";
-    }
+		if (this._mode === "rotate") { this._mode = "distort"; } 
+		else { this._mode = "rotate"; }
 
     this._showToolbar();
 
     map.addLayer(this._handles[this._mode]);
   },
 
   _toggleScale: function() {
-    var map = this._overlay._map;
-    if (this._mode === "lock") {
-      return;
-    }
+		var map = this._overlay._map;
+
+    if (this._mode === "lock") { return; }
 
     map.removeLayer(this._handles[this._mode]);
 
-    if (this._mode === "scale") {
-      this._mode = "distort";
-    } else {
-      this._mode = "scale";
-    }
+		if (this._mode === "scale") { this._mode = "distort"; } 
+		else { this._mode = "scale"; }
 
     this._showToolbar();
 
     map.addLayer(this._handles[this._mode]);
   },
 
   _toggleRotate: function() {
-    var map = this._overlay._map;
+		var map = this._overlay._map;
+
+		if (this._mode === "lock") { return; }
 
     map.removeLayer(this._handles[this._mode]);
     this._mode = "rotateStandalone";
 
-    this._showToolbar();
+		this._showToolbar();
+
     map.addLayer(this._handles[this._mode]);
   },
 
@@ -1656,9 +1641,7 @@ L.DistortableImage.Edit = L.Handler.extend({
       this._enableDragging();
     } else {
       this._mode = "lock";
-      if (this.dragging) {
-        this.dragging.disable();
-      }
+      if (this.dragging) { this.dragging.disable(); }
       delete this.dragging;
     }
 
@@ -1686,9 +1669,7 @@ L.DistortableImage.Edit = L.Handler.extend({
   },
 
   _showMarkers: function() {
-    if (this._mode === "lock") {
-      return;
-    }
+    if (this._mode === "lock") { return; }
     var currentHandle = this._handles[this._mode];
     currentHandle.eachLayer(function(layer) {
       layer.setOpacity(1);
@@ -1716,7 +1697,6 @@ L.DistortableImage.Edit = L.Handler.extend({
   // TODO: toolbar for multiple image selection
   _showToolbar: function() {
     var overlay = this._overlay,
-      // target = event.target,
       map = overlay._map;
 
     /* Ensure that there is only ever one toolbar attached to each image. */

diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
@@ -97,7 +97,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
           layer.editing._hideToolbar();
         }
         layer._dragStartPoints[i] = layer._map.latLngToLayerPoint(
-          layer.getCorners()[i]
+          layer.getCorner(i)
         );
       }
     });
@@ -113,7 +113,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
     overlay._dragPoints = {};
 
     for (i = 0; i < 4; i++) {
-      overlay._dragPoints[i] = map.latLngToLayerPoint(overlay.getCorners()[i]);
+      overlay._dragPoints[i] = map.latLngToLayerPoint(overlay.getCorner(i));
     }
 
     var cpd = overlay._calcCornerPointDelta();

diff --git a/src/edit/DistortableImage.Edit.js b/src/edit/DistortableImage.Edit.js
@@ -115,20 +115,13 @@ L.DistortableImage.Edit = L.Handler.extend({
     // L.DomEvent.off(map, "zoomstart", this._handleZoomStart, this);
     // L.DomEvent.off(map, "zoomend", this._handleZoomEnd, this);
     L.DomEvent.off(overlay._image, "click", this._select, this);
-    // L.DomEvent.off(overlay._image, "dblclick", this._toolbarSendDown, this);
 
     // First, check if dragging exists - it may be off due to locking
-    if (this.dragging) {
-      this.dragging.disable();
-    }
+    if (this.dragging) { this.dragging.disable(); }
     delete this.dragging;
 
-    if (this.toolbar) {
-      this._hideToolbar();
-    }
-    if (this.editing) {
-      this.editing.disable();
-    }
+    if (this.toolbar) { this._hideToolbar(); }
+    if (this.editing) { this.editing.disable(); }
 
     map.removeLayer(this._handles[this._mode]);
 
@@ -213,14 +206,10 @@ L.DistortableImage.Edit = L.Handler.extend({
     this.dragging.enable();
 
     /* Hide toolbars and markers while dragging; click will re-show it */
-    this.dragging.on(
-      "dragstart",
-      function() {
-        overlay.fire("dragstart");
-        this._hideToolbar();
-      },
-      this
-    );
+    this.dragging.on("dragstart", function() {
+      overlay.fire("dragstart");
+      this._hideToolbar();
+    },this);
 
     /*
      * Adjust default behavior of L.Draggable.
@@ -239,7 +228,8 @@ L.DistortableImage.Edit = L.Handler.extend({
       for (i = 0; i < 4; i++) {
         currentPoint = map.latLngToLayerPoint(overlay._corners[i]);
         overlay._corners[i] = map.layerPointToLatLng(currentPoint.add(delta));
-      }
+			}
+
       overlay._reset();
       overlay.fire("update");
       overlay.fire("drag");
@@ -252,10 +242,7 @@ L.DistortableImage.Edit = L.Handler.extend({
     var keymap = this.options.keymap,
       handlerName = keymap[event.which];
 
-    if (
-      handlerName !== undefined &&
-      this._overlay.options.suppressToolbar !== true
-    ) {
+    if (handlerName !== undefined && this._overlay.options.suppressToolbar !== true) {
       this[handlerName].call(this);
     }
   },
@@ -266,43 +253,39 @@ L.DistortableImage.Edit = L.Handler.extend({
     map.removeLayer(this._handles[this._mode]);
 
     /* Switch mode. */
-    if (this._mode === "rotate") {
-      this._mode = "distort";
-    } else {
-      this._mode = "rotate";
-    }
+		if (this._mode === "rotate") { this._mode = "distort"; } 
+		else { this._mode = "rotate"; }
 
     this._showToolbar();
 
     map.addLayer(this._handles[this._mode]);
   },
 
   _toggleScale: function() {
-    var map = this._overlay._map;
-    if (this._mode === "lock") {
-      return;
-    }
+		var map = this._overlay._map;
+
+    if (this._mode === "lock") { return; }
 
     map.removeLayer(this._handles[this._mode]);
 
-    if (this._mode === "scale") {
-      this._mode = "distort";
-    } else {
-      this._mode = "scale";
-    }
+		if (this._mode === "scale") { this._mode = "distort"; } 
+		else { this._mode = "scale"; }
 
     this._showToolbar();
 
     map.addLayer(this._handles[this._mode]);
   },
 
   _toggleRotate: function() {
-    var map = this._overlay._map;
+		var map = this._overlay._map;
+
+		if (this._mode === "lock") { return; }
 
     map.removeLayer(this._handles[this._mode]);
     this._mode = "rotateStandalone";
 
-    this._showToolbar();
+		this._showToolbar();
+
     map.addLayer(this._handles[this._mode]);
   },
 
@@ -350,9 +333,7 @@ L.DistortableImage.Edit = L.Handler.extend({
       this._enableDragging();
     } else {
       this._mode = "lock";
-      if (this.dragging) {
-        this.dragging.disable();
-      }
+      if (this.dragging) { this.dragging.disable(); }
       delete this.dragging;
     }
 
@@ -380,9 +361,7 @@ L.DistortableImage.Edit = L.Handler.extend({
   },
 
   _showMarkers: function() {
-    if (this._mode === "lock") {
-      return;
-    }
+    if (this._mode === "lock") { return; }
     var currentHandle = this._handles[this._mode];
     currentHandle.eachLayer(function(layer) {
       layer.setOpacity(1);
@@ -410,7 +389,6 @@ L.DistortableImage.Edit = L.Handler.extend({
   // TODO: toolbar for multiple image selection
   _showToolbar: function() {
     var overlay = this._overlay,
-      // target = event.target,
       map = overlay._map;
 
     /* Ensure that there is only ever one toolbar attached to each image. */

diff --git a/src/edit/RotateAndScaleHandle.js b/src/edit/RotateAndScaleHandle.js
@@ -16,8 +16,6 @@ L.RotateAndScaleHandle = L.EditHandle.extend({
 			angle = this._calculateAngle(formerLatLng, newLatLng),
 			scale = this._calculateScalingFactor(formerLatLng, newLatLng);
 
-		overlay.editing._hideToolbar();
-
 		overlay.editing._rotateBy(angle);
 
 		/* 
@@ -35,6 +33,8 @@ L.RotateAndScaleHandle = L.EditHandle.extend({
 
 		overlay.fire('update');
 
+		this._handled.editing._showToolbar();
+
 	},
 
 	updateHandle: function() {