diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-04 14:05:10 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-04 14:05:10 -0500 |
| commit | 94f25dc59aa1066321a23a5c2f00521dea87fbc0 (patch) | |
| tree | 56855b3298af7f443979d0c83b3a9eca0366cf8a /public/assets/javascripts/ui/editor | |
| parent | 3f90aca295fc206f25b41e4c219a62171dbed650 (diff) | |
backspace shortcut to delete scenery
Diffstat (limited to 'public/assets/javascripts/ui/editor')
| -rw-r--r-- | public/assets/javascripts/ui/editor/MediaEditor.js | 13 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/editor/TextEditor.js | 6 |
2 files changed, 4 insertions, 15 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js index 9a3c355..db5878f 100644 --- a/public/assets/javascripts/ui/editor/MediaEditor.js +++ b/public/assets/javascripts/ui/editor/MediaEditor.js @@ -179,17 +179,8 @@ var MediaEditor = FormView.extend({ var scenery = this.scenery this.hide() - UndoStack.push({ - type: 'destroy-scenery', - undo: scenery.serialize(), - redo: { id: scenery.id }, - }) - - // TODO: watch individual scenery object here - Minotaur.watch( app.router.editorView.settings ) - - Scenery.remove(scenery.id) - Scenery.resize.hide() + scenery.remove() + this.tainted = false this.scenery = null }, diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js index b559ba5..51077af 100644 --- a/public/assets/javascripts/ui/editor/TextEditor.js +++ b/public/assets/javascripts/ui/editor/TextEditor.js @@ -136,10 +136,8 @@ var TextEditor = FormView.extend({ }, destroy: function(){ - var scenery = this.scenery - this.hide() - Scenery.remove(scenery.id) - Scenery.resize.hide() + this.tainted = false + this.scenery.remove() }, }) |
