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

Jump to bottom

Updated keymap and handlerName to new key method #216

Closed
wants to merge 7 commits into from
Closed

Updated keymap and handlerName to new key method #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
40f67db
Updated keymap and handlerName to new key method
SteliosPhanartzis Apr 15, 2019
4c7dbfa
Removed redundant comments
Apr 17, 2019
91e3299
Built code into dist/ folder
SteliosPhanartzis Apr 17, 2019
0621d23
Delete package-lock.json
Apr 17, 2019
18d0c5b
Pulled updates from master, rolled back package-lock.json deletion
SteliosPhanartzis Apr 20, 2019
92104b9
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
sashadev-sky Apr 21, 2019
bc751f9
Reinstate package-lock.json rebased from upstream main
sashadev-sky Apr 22, 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
27 changes: 12 additions & 15 deletions dist/leaflet.distortableimage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,20 +1228,17 @@ L.DistortableImage.Edit = L.Handler.extend({
opacity: 0.7,
outline: "1px solid red",
keymap: {
8: "_removeOverlay", // backspace windows / delete mac
46: "_removeOverlay", // delete windows / delete + fn mac
20: "_toggleRotate", // CAPS
27: "_deselect", // esc
68: "_toggleRotateDistort", // d
69: "_toggleIsolate", // e
73: "_toggleIsolate", // i
74: "_sendUp", // j
75: "_sendDown", // k
76: "_toggleLock", // l
79: "_toggleOutline", // o
82: "_toggleRotateDistort", // r
83: "_toggleScale", // s
84: "_toggleTransparency" // t
'CapsLock': '_toggleRotate',
'Escape': '_deselect',
'd': '_toggleRotateDistort',
'i': '_toggleIsolate',
'j': '_sendUp',
'k': '_sendDown',
'l': '_toggleLock',
'o': '_toggleOutline',
'r': '_toggleRotateDistort',
's': '_toggleScale',
't': '_toggleTransparency',
}
},

Expand Down Expand Up @@ -1441,7 +1438,7 @@ L.DistortableImage.Edit = L.Handler.extend({

_onKeyDown: function(event) {
var keymap = this.options.keymap,
handlerName = keymap[event.which];
handlerName = keymap[event.key];

if (handlerName !== undefined && this._overlay.options.suppressToolbar !== true) {
this[handlerName].call(this);
Expand Down
27 changes: 12 additions & 15 deletions src/edit/DistortableImage.Edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,17 @@ L.DistortableImage.Edit = L.Handler.extend({
opacity: 0.7,
outline: "1px solid red",
keymap: {
8: "_removeOverlay", // backspace windows / delete mac
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please re-add the two _removeOverlay lines.

46: "_removeOverlay", // delete windows / delete + fn mac
20: "_toggleRotate", // CAPS
27: "_deselect", // esc
68: "_toggleRotateDistort", // d
69: "_toggleIsolate", // e
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please re-add the _toggleIsolate line for e as well

73: "_toggleIsolate", // i
74: "_sendUp", // j
75: "_sendDown", // k
76: "_toggleLock", // l
79: "_toggleOutline", // o
82: "_toggleRotateDistort", // r
83: "_toggleScale", // s
84: "_toggleTransparency" // t
'CapsLock': '_toggleRotate',
'Escape': '_deselect',
'd': '_toggleRotateDistort',
'i': '_toggleIsolate',
'j': '_sendUp',
'k': '_sendDown',
'l': '_toggleLock',
'o': '_toggleOutline',
'r': '_toggleRotateDistort',
's': '_toggleScale',
't': '_toggleTransparency',
}
},

Expand Down Expand Up @@ -218,7 +215,7 @@ L.DistortableImage.Edit = L.Handler.extend({

_onKeyDown: function(event) {
var keymap = this.options.keymap,
handlerName = keymap[event.which];
handlerName = keymap[event.key];

if (handlerName !== undefined && this._overlay.options.suppressToolbar !== true) {
this[handlerName].call(this);
Expand Down