Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix toolbar undefined #295

Closed
wants to merge 4 commits into from
+103 −87
Closed

Fix toolbar undefined #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3585696
update dist
sashadev-sky May 30, 2019
fe9d7b6
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
sashadev-sky Jun 2, 2019
a5771aa
update toolbar dependency
sashadev-sky Jun 5, 2019
4c0a65f
Fix namespace
sashadev-sky Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 35 additions & 36 deletions dist/leaflet.distortableimage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}),

Expand Down Expand Up @@ -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 || {};
Expand Down Expand Up @@ -1310,29 +1309,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));
}
Expand Down
46 changes: 32 additions & 14 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
71 changes: 35 additions & 36 deletions src/edit/DistortableImage.EditToolbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}),

Expand Down Expand Up @@ -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)";
}
}
});