Browse Source

Update add in Keymaps

pull/1840/head
Artur Arseniev 8 years ago
parent
commit
4c65650b64
  1. 7
      src/keymaps/index.js

7
src/keymaps/index.js

@ -110,7 +110,7 @@ module.exports = () => {
for (let id in defKeys) { for (let id in defKeys) {
const value = defKeys[id]; const value = defKeys[id];
this.add(id, value.keys, value.handler, { force: false }); this.add(id, value.keys, value.handler);
} }
}, },
@ -136,8 +136,7 @@ module.exports = () => {
* }) * })
*/ */
add(id, keys, handler, opts = {}) { add(id, keys, handler, opts = {}) {
const em = this.em; const { em } = this;
const force = opts.force || false;
const cmd = em.get('Commands'); const cmd = em.get('Commands');
const editor = em.getEditor(); const editor = em.getEditor();
const canvas = em.get('Canvas'); const canvas = em.get('Canvas');
@ -151,7 +150,7 @@ module.exports = () => {
handler = isString(handler) ? cmd.get(handler) : handler; handler = isString(handler) ? cmd.get(handler) : handler;
opts.prevent && canvas.getCanvasView().preventDefault(e); opts.prevent && canvas.getCanvasView().preventDefault(e);
const ableTorun = !em.isEditing() && !editor.Canvas.isInputFocused(); const ableTorun = !em.isEditing() && !editor.Canvas.isInputFocused();
if (ableTorun || force) { if (ableTorun || opts.force) {
typeof handler == 'object' typeof handler == 'object'
? handler.run(editor, 0, opt) ? handler.run(editor, 0, opt)
: handler(editor, 0, opt); : handler(editor, 0, opt);

Loading…
Cancel
Save