Browse Source

Don't remove focused elements on delete key. Fixes #1606

pull/1625/head
artf 8 years ago
parent
commit
81fba33d19
  1. 2
      src/commands/view/ComponentDelete.js
  2. 7
      src/commands/view/ComponentEnter.js
  3. 7
      src/commands/view/ComponentExit.js
  4. 7
      src/commands/view/ComponentNext.js
  5. 7
      src/commands/view/ComponentPrev.js
  6. 2
      src/commands/view/CopyComponent.js
  7. 2
      src/commands/view/PasteComponent.js

2
src/commands/view/ComponentDelete.js

@ -2,7 +2,7 @@ import { isArray } from 'underscore';
module.exports = {
run(ed, sender, opts = {}) {
if (ed.getModel().isEditing()) return;
if (ed.getModel().isEditing() || ed.Canvas.isInputFocused()) return;
let components = opts.component || ed.getSelectedAll();
components = isArray(components) ? [...components] : [components];

7
src/commands/view/ComponentEnter.js

@ -1,6 +1,11 @@
module.exports = {
run(ed) {
if (!ed.Canvas.hasFocus() || ed.getModel().isEditing()) return;
if (
!ed.Canvas.hasFocus() ||
ed.getModel().isEditing() ||
ed.Canvas.isInputFocused()
)
return;
const toSelect = [];
ed.getSelectedAll().forEach(component => {

7
src/commands/view/ComponentExit.js

@ -1,6 +1,11 @@
module.exports = {
run(ed) {
if (!ed.Canvas.hasFocus() || ed.getModel().isEditing()) return;
if (
!ed.Canvas.hasFocus() ||
ed.getModel().isEditing() ||
ed.Canvas.isInputFocused()
)
return;
const toSelect = [];
ed.getSelectedAll().forEach(component => {

7
src/commands/view/ComponentNext.js

@ -1,6 +1,11 @@
module.exports = {
run(ed) {
if (!ed.Canvas.hasFocus() || ed.getModel().isEditing()) return;
if (
!ed.Canvas.hasFocus() ||
ed.getModel().isEditing() ||
ed.Canvas.isInputFocused()
)
return;
const toSelect = [];
ed.getSelectedAll().forEach(component => {

7
src/commands/view/ComponentPrev.js

@ -1,6 +1,11 @@
module.exports = {
run(ed) {
if (!ed.Canvas.hasFocus() || ed.getModel().isEditing()) return;
if (
!ed.Canvas.hasFocus() ||
ed.getModel().isEditing() ||
ed.Canvas.isInputFocused()
)
return;
const toSelect = [];
ed.getSelectedAll().forEach(component => {

2
src/commands/view/CopyComponent.js

@ -3,7 +3,7 @@ module.exports = {
const em = ed.getModel();
const models = [...ed.getSelectedAll()];
if (models.length && !em.isEditing()) {
if (models.length && !em.isEditing() && !ed.Canvas.isInputFocused()) {
em.set('clipboard', models);
}
}

2
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()) {
if (clp && selected && !em.isEditing() && !ed.Canvas.isInputFocused()) {
ed.getSelectedAll().forEach(comp => {
if (!comp) return;
const coll = comp.collection;

Loading…
Cancel
Save