From 31cf595f19001e47df5ee4c0c21a6f38bef6ae6c Mon Sep 17 00:00:00 2001 From: Arthur Almeida Date: Sat, 16 Feb 2019 19:21:25 -0200 Subject: [PATCH] removed validation to check if editor is on edit mode --- src/commands/view/ComponentDelete.js | 1 - src/commands/view/ComponentEnter.js | 7 +------ src/commands/view/ComponentExit.js | 7 +------ src/commands/view/ComponentNext.js | 7 +------ src/commands/view/ComponentPrev.js | 7 +------ src/commands/view/CopyComponent.js | 2 +- src/commands/view/PasteComponent.js | 2 +- 7 files changed, 6 insertions(+), 27 deletions(-) diff --git a/src/commands/view/ComponentDelete.js b/src/commands/view/ComponentDelete.js index 2fc73c033..6ca695f3e 100644 --- a/src/commands/view/ComponentDelete.js +++ b/src/commands/view/ComponentDelete.js @@ -2,7 +2,6 @@ import { isArray } from 'underscore'; module.exports = { run(ed, sender, opts = {}) { - if (ed.getModel().isEditing() || ed.Canvas.isInputFocused()) return; let components = opts.component || ed.getSelectedAll(); components = isArray(components) ? [...components] : [components]; diff --git a/src/commands/view/ComponentEnter.js b/src/commands/view/ComponentEnter.js index 3f1a9bc3b..a06efae09 100644 --- a/src/commands/view/ComponentEnter.js +++ b/src/commands/view/ComponentEnter.js @@ -1,11 +1,6 @@ module.exports = { run(ed) { - if ( - !ed.Canvas.hasFocus() || - ed.getModel().isEditing() || - ed.Canvas.isInputFocused() - ) - return; + if (!ed.Canvas.hasFocus()) return; const toSelect = []; ed.getSelectedAll().forEach(component => { diff --git a/src/commands/view/ComponentExit.js b/src/commands/view/ComponentExit.js index 0dff37e03..d13328704 100644 --- a/src/commands/view/ComponentExit.js +++ b/src/commands/view/ComponentExit.js @@ -1,11 +1,6 @@ module.exports = { run(ed) { - if ( - !ed.Canvas.hasFocus() || - ed.getModel().isEditing() || - ed.Canvas.isInputFocused() - ) - return; + if (!ed.Canvas.hasFocus()) return; const toSelect = []; ed.getSelectedAll().forEach(component => { diff --git a/src/commands/view/ComponentNext.js b/src/commands/view/ComponentNext.js index c0af4744d..f47ea4d5b 100644 --- a/src/commands/view/ComponentNext.js +++ b/src/commands/view/ComponentNext.js @@ -1,11 +1,6 @@ module.exports = { run(ed) { - if ( - !ed.Canvas.hasFocus() || - ed.getModel().isEditing() || - ed.Canvas.isInputFocused() - ) - return; + if (!ed.Canvas.hasFocus()) return; const toSelect = []; ed.getSelectedAll().forEach(component => { diff --git a/src/commands/view/ComponentPrev.js b/src/commands/view/ComponentPrev.js index 0fe40ebcb..47c57150d 100644 --- a/src/commands/view/ComponentPrev.js +++ b/src/commands/view/ComponentPrev.js @@ -1,11 +1,6 @@ module.exports = { run(ed) { - if ( - !ed.Canvas.hasFocus() || - ed.getModel().isEditing() || - ed.Canvas.isInputFocused() - ) - return; + if (!ed.Canvas.hasFocus()) return; const toSelect = []; ed.getSelectedAll().forEach(component => { diff --git a/src/commands/view/CopyComponent.js b/src/commands/view/CopyComponent.js index c26cd1ecb..dc396401a 100644 --- a/src/commands/view/CopyComponent.js +++ b/src/commands/view/CopyComponent.js @@ -3,7 +3,7 @@ module.exports = { const em = ed.getModel(); const models = [...ed.getSelectedAll()]; - if (models.length && !em.isEditing() && !ed.Canvas.isInputFocused()) { + if (models.length) { em.set('clipboard', models); } } diff --git a/src/commands/view/PasteComponent.js b/src/commands/view/PasteComponent.js index 98ebeedbd..c715b8720 100644 --- a/src/commands/view/PasteComponent.js +++ b/src/commands/view/PasteComponent.js @@ -6,7 +6,7 @@ module.exports = { const clp = em.get('clipboard'); const selected = ed.getSelected(); - if (clp && selected && !em.isEditing() && !ed.Canvas.isInputFocused()) { + if (clp && selected) { ed.getSelectedAll().forEach(comp => { if (!comp) return; const coll = comp.collection;