merge

1 files changed, 20 insertions, 24 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 7d148cf..12705d3 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -2,7 +2,7 @@
 Scenery.move = function(base){
 
 	var x, y, z, position, dimension, bounds
-	var dragging = false
+	var dragging = false, moved = false
 	var oldState
 
 	this.bind = function(){
@@ -22,18 +22,9 @@ Scenery.move = function(base){
 	}
 	
 	function down (e, cursor){
-		if (e.target != base.mx.el) return;
+		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
 		}
 
@@ -45,6 +36,7 @@ Scenery.move = function(base){
 			return
 		}
 		dragging = true
+		moved = false
 		x = base.mx.x
 		y = base.mx.y
 		z = base.mx.z
@@ -59,6 +51,8 @@ Scenery.move = function(base){
 	
 	function drag (e, cursor){
 		if (! dragging) return
+		
+		moved = true
 
 		var flipX = base.wall.side & (FRONT | RIGHT)
 
@@ -89,21 +83,23 @@ Scenery.move = function(base){
 
 	function up (e, cursor){
     if (! dragging || ! oldState) return
-    
-		dragging = false
-		document.body.classList.remove("dragging")
+        
+    if (moved) {
+      UndoStack.push({
+        type: 'update-scenery',
+        undo: oldState,
+        redo: base.serialize(),
+      })
 
-    UndoStack.push({
-      type: 'update-scenery',
-      undo: oldState,
-      redo: base.serialize(),
-    })
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
+    }
 
-    // TODO: watch individual scenery object here
-    Minotaur.watch( app.router.editorView.settings )
-  
+		dragging = moved = false
     oldState = null
-	}
+		document.body.classList.remove("dragging")
+
+  }
 	
 	function switch_wall (e, target, cursor){
 		if (! dragging) return