From 35856964b724c164629932977383fb4b7518af8b Mon Sep 17 00:00:00 2001 From: sashadev-sky Date: Thu, 30 May 2019 13:38:50 -0400 Subject: [PATCH 1/3] update dist --- dist/leaflet.distortableimage.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js index 6f5ee9478..76f40daf7 100644 --- a/dist/leaflet.distortableimage.js +++ b/dist/leaflet.distortableimage.js @@ -1310,29 +1310,29 @@ L.DistortableImage.Edit = L.Handler.extend({ var overlay = this._overlay, i; - this._lockHandles = new L.LayerGroup(); + this._lockHandles = L.layerGroup(); for (i = 0; i < 4; i++) { this._lockHandles.addLayer( new L.LockHandle(overlay, i, { draggable: false }) ); } - this._distortHandles = new L.LayerGroup(); + this._distortHandles = L.layerGroup(); for (i = 0; i < 4; i++) { this._distortHandles.addLayer(new L.DistortHandle(overlay, i)); } - this._rotateHandles = new L.LayerGroup(); // individual rotate + this._rotateHandles = L.layerGroup(); // individual rotate for (i = 0; i < 4; i++) { this._rotateHandles.addLayer(new L.RotateHandle(overlay, i)); } - this._scaleHandles = new L.LayerGroup(); + this._scaleHandles = L.layerGroup(); for (i = 0; i < 4; i++) { this._scaleHandles.addLayer(new L.ScaleHandle(overlay, i)); } - this._rotateScaleHandles = new L.LayerGroup(); // handle includes rotate AND scale + this._rotateScaleHandles = L.layerGroup(); // handle includes rotate AND scale for (i = 0; i < 4; i++) { this._rotateScaleHandles.addLayer(new L.RotateScaleHandle(overlay, i)); } From a5771aac0bfb316bfe152c1815b61d16d2b77e2d Mon Sep 17 00:00:00 2001 From: sashadev-sky Date: Wed, 5 Jun 2019 03:33:25 -0400 Subject: [PATCH 2/3] update toolbar dependency --- package-lock.json | 46 ++++++++++++++++++++++++++++++++-------------- package.json | 2 +- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index d7d178473..b8ca20cfd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1732,7 +1732,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -1753,12 +1754,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1773,17 +1776,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -1900,7 +1906,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -1912,6 +1919,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1926,6 +1934,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -1933,12 +1942,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -1957,6 +1968,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2037,7 +2049,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2049,6 +2062,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2134,7 +2148,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -2170,6 +2185,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2189,6 +2205,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2232,12 +2249,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -3431,9 +3450,8 @@ "dev": true }, "leaflet-toolbar": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/leaflet-toolbar/-/leaflet-toolbar-0.3.0.tgz", - "integrity": "sha1-ZuO0/Cdr3vlUlW9GmdGAJFnFk4w=", + "version": "git+https://github.com/Leaflet/Leaflet.toolbar.git#0a080860542dbd1cc5fb3a543f68c4a799d9c88c", + "from": "git+https://github.com/Leaflet/Leaflet.toolbar.git", "dev": true }, "levn": { diff --git a/package.json b/package.json index 66f0ecb03..8f5f256d6 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "karma-mocha-reporter": "^2.2.5", "karma-phantomjs-launcher": "^1.0.4", "leaflet": "^1.0.0", - "leaflet-toolbar": "^0.3.0", + "leaflet-toolbar": "git+https://github.com/Leaflet/Leaflet.toolbar.git", "matchdep": "^2.0.0", "mocha": "^6.0.0", "phantomjs-prebuilt": "^2.1.16", From 4c0a65f81ee4c7766fdfff614a1e8a947fde3dc3 Mon Sep 17 00:00:00 2001 From: sashadev-sky Date: Wed, 5 Jun 2019 03:41:19 -0400 Subject: [PATCH 3/3] Fix namespace --- dist/leaflet.distortableimage.js | 61 ++++++++++---------- src/edit/DistortableImage.EditToolbar.js | 71 ++++++++++++------------ 2 files changed, 65 insertions(+), 67 deletions(-) diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js index 76f40daf7..9889b8867 100644 --- a/dist/leaflet.distortableimage.js +++ b/dist/leaflet.distortableimage.js @@ -1032,12 +1032,12 @@ L.ScaleHandle = L.EditHandle.extend({ L.DistortableImage = L.DistortableImage || {}; -var EditOverlayAction = LeafletToolbar.ToolbarAction.extend({ +var EditOverlayAction = L.Toolbar2.Action.extend({ initialize: function(map, overlay, options) { this._overlay = overlay; this._map = map; - LeafletToolbar.ToolbarAction.prototype.initialize.call(this, options); + L.Toolbar2.Action.prototype.initialize.call(this, options); } }), @@ -1176,41 +1176,40 @@ var EditOverlayAction = LeafletToolbar.ToolbarAction.extend({ } }); -L.DistortableImage.EditToolbar = LeafletToolbar.Popup.extend({ - options: { - actions: [ - ToggleTransparency, - RemoveOverlay, - ToggleOutline, - ToggleEditable, - ToggleRotateScale, - ToggleExport, - EnableEXIF, - ToggleOrder - ] - }, - - // todo: move to some sort of util class, these methods could be useful in future - _rotateToolbarAngleDeg: function (angle) { - var div = this._container, - divStyle = div.style; +L.DistortableImage.EditToolbar = L.Toolbar2.Popup.extend({ + options: { + actions: [ + ToggleTransparency, + RemoveOverlay, + ToggleOutline, + ToggleEditable, + ToggleRotateScale, + ToggleExport, + EnableEXIF, + ToggleOrder + ] + }, - var oldTransform = divStyle.transform; + // todo: move to some sort of util class, these methods could be useful in future + _rotateToolbarAngleDeg: function(angle) { + var div = this._container, + divStyle = div.style; - divStyle.transform = oldTransform + "rotate(" + angle + "deg)"; - divStyle.transformOrigin = "1080% 650%"; + var oldTransform = divStyle.transform; - this._rotateToolbarIcons(angle); - }, + divStyle.transform = oldTransform + "rotate(" + angle + "deg)"; + divStyle.transformOrigin = "1080% 650%"; - _rotateToolbarIcons: function (angle) { - var icons = document.querySelectorAll(".fa"); + this._rotateToolbarIcons(angle); + }, - for (var i = 0; i < icons.length; i++) { - icons.item(i).style.transform = "rotate(" + -angle + "deg)"; - } - }, + _rotateToolbarIcons: function(angle) { + var icons = document.querySelectorAll(".fa"); + for (var i = 0; i < icons.length; i++) { + icons.item(i).style.transform = "rotate(" + -angle + "deg)"; + } + } }); L.DistortableImage = L.DistortableImage || {}; diff --git a/src/edit/DistortableImage.EditToolbar.js b/src/edit/DistortableImage.EditToolbar.js index 8538bbed9..f352aba12 100644 --- a/src/edit/DistortableImage.EditToolbar.js +++ b/src/edit/DistortableImage.EditToolbar.js @@ -1,11 +1,11 @@ L.DistortableImage = L.DistortableImage || {}; -var EditOverlayAction = LeafletToolbar.ToolbarAction.extend({ +var EditOverlayAction = L.Toolbar2.Action.extend({ initialize: function(map, overlay, options) { this._overlay = overlay; this._map = map; - LeafletToolbar.ToolbarAction.prototype.initialize.call(this, options); + L.Toolbar2.Action.prototype.initialize.call(this, options); } }), @@ -144,39 +144,38 @@ var EditOverlayAction = LeafletToolbar.ToolbarAction.extend({ } }); -L.DistortableImage.EditToolbar = LeafletToolbar.Popup.extend({ - options: { - actions: [ - ToggleTransparency, - RemoveOverlay, - ToggleOutline, - ToggleEditable, - ToggleRotateScale, - ToggleExport, - EnableEXIF, - ToggleOrder - ] - }, - - // todo: move to some sort of util class, these methods could be useful in future - _rotateToolbarAngleDeg: function (angle) { - var div = this._container, - divStyle = div.style; - - var oldTransform = divStyle.transform; - - divStyle.transform = oldTransform + "rotate(" + angle + "deg)"; - divStyle.transformOrigin = "1080% 650%"; - - this._rotateToolbarIcons(angle); - }, - - _rotateToolbarIcons: function (angle) { - var icons = document.querySelectorAll(".fa"); - - for (var i = 0; i < icons.length; i++) { - icons.item(i).style.transform = "rotate(" + -angle + "deg)"; - } - }, +L.DistortableImage.EditToolbar = L.Toolbar2.Popup.extend({ + options: { + actions: [ + ToggleTransparency, + RemoveOverlay, + ToggleOutline, + ToggleEditable, + ToggleRotateScale, + ToggleExport, + EnableEXIF, + ToggleOrder + ] + }, + + // todo: move to some sort of util class, these methods could be useful in future + _rotateToolbarAngleDeg: function(angle) { + var div = this._container, + divStyle = div.style; + + var oldTransform = divStyle.transform; + + divStyle.transform = oldTransform + "rotate(" + angle + "deg)"; + divStyle.transformOrigin = "1080% 650%"; + this._rotateToolbarIcons(angle); + }, + + _rotateToolbarIcons: function(angle) { + var icons = document.querySelectorAll(".fa"); + + for (var i = 0; i < icons.length; i++) { + icons.item(i).style.transform = "rotate(" + -angle + "deg)"; + } + } });