2 files changed, 32 insertions, 19 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 13580a8..12705d3 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -22,19 +22,9 @@ Scenery.move = function(base){
 	}
 	
 	function down (e, cursor){
-	console.log(e.target, base.mx.overlay)
 		if (e.target != base.mx.el && (e.target != base.mx.overlay)) return;
 		if (editor.permissions.destroy) {
-      UndoStack.push({
-        type: 'destroy-scenery',
-        undo: base.serialize(),
-        redo: { id: base.id },
-      })
-
-      // TODO: watch individual scenery object here
-      Minotaur.watch( app.router.editorView.settings )
-
-			Scenery.remove(base.id)
+		  base.remove()
 			return
 		}
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 4e5e2c5..10ba2b0 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -62,20 +62,43 @@ Scenery.types.base = Fiber.extend(function(base){
 		
 		bind: function(){
 			this.move.bind()
-			$(this.mx.el).bind({
-				mouseenter: this.enter,
-				mouseleave: this.leave,
-			})
+// 			$(this.mx.el).bind({
+// 				mouseenter: this.enter,
+// 				mouseleave: this.leave,
+// 			})
 		},
 	
 		unbind: function(){
 			this.move.unbind()
-			$(this.mx.el).unbind({
-				mouseenter: this.enter,
-				mouseleave: this.leave,
-			})
+// 			$(this.mx.el).unbind({
+// 				mouseenter: this.enter,
+// 				mouseleave: this.leave,
+// 			})
 		},
 		
+		remove: function(){
+      UndoStack.push({
+        type: 'destroy-scenery',
+        undo: this.serialize(),
+        redo: { id: this.id },
+      })
+
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
+
+			Scenery.remove(this.id)
+
+      Scenery.resize.hide()
+      if (app.controller.mediaEditor) {
+        app.controller.mediaEditor.tainted = false
+        app.controller.mediaEditor.hide()
+      }
+      if (app.controller.textEditor) {
+        app.controller.textEditor.tainted = false
+        app.controller.textEditor.hide()
+      }
+		},
+
 		destroy: function(){
 			this.unbind()
 			scene.remove(this.mx)