merge

3 files changed, 28 insertions, 1 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index fa247e1..f2d37d8 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -30,6 +30,9 @@ Scenery.move = function(base){
         redo: { id: base.id },
       })
 
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
+
 			Scenery.remove(base.id)
 			return
 		}
@@ -81,7 +84,10 @@ Scenery.move = function(base){
       undo: oldState,
       redo: base.serialize(),
     })
-    
+
+    // TODO: watch individual scenery object here
+    Minotaur.watch( app.router.editorView.settings )
+
     oldState = null
 	}
 	
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index c5c754a..6b2e52c 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -200,6 +200,9 @@ Scenery.resize = new function(){
       redo: obj.serialize(),
     })
 
+    // TODO: watch individual scenery object here
+    Minotaur.watch( app.router.editorView.settings )
+
 		document.body.classList.remove("dragging")
 	}
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 7798550..54ab755 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -4,9 +4,15 @@
 			type: "create-scenery",
       undo: function(state){
         Scenery.remove(state.id)
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
       redo: function(state){
         Scenery.deserialize([ state ])
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
 		},
 		{
@@ -19,6 +25,9 @@
         if (editor.permissions.resize) {
           Scenery.resize.show(scenery)
         }
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
       redo: function(state){
         var scenery = Scenery.find(state.id)
@@ -30,15 +39,24 @@
           Scenery.resize.rotate_dots()
           Scenery.resize.move_dots()
         }
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
 		},
 		{
 			type: "destroy-scenery",
       undo: function(state){
         Scenery.deserialize([ state ])
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
       redo: function(state){
         Scenery.remove(state.id)
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
 		},