summaryrefslogtreecommitdiff
path: root/public/assets/javascripts
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts')
-rw-r--r--public/assets/javascripts/rectangles/engine/scenery/undo.js4
-rw-r--r--public/assets/javascripts/rectangles/models/wall.js7
-rw-r--r--public/assets/javascripts/ui/editor/LightControl.js2
3 files changed, 5 insertions, 8 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index ac9fdc0..e5624a0 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -111,6 +111,8 @@
undo: function(state){
var wall = Walls.lookup[state.id]
wall.deserialize(state)
+
+ Minotaur.watch( app.router.editorView.settings )
},
},
{
@@ -118,6 +120,8 @@
undo: function(state){
Walls.setColor[ state.mode ]( state.rgb )
app.router.editorView.lightControl.setSwatchColor( state.mode, state.rgb )
+
+ Minotaur.watch( app.router.editorView.settings )
},
},
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 05a78f7..0f74f4c 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -70,9 +70,6 @@
undo: { id: scenery.id },
redo: scenery.serialize(),
})
-
- // TODO: watch individual scenery object here
- Minotaur.watch( app.router.editorView.settings )
}
else if (Scenery.nextWallpaper) {
var oldState = base.serialize()
@@ -84,9 +81,7 @@
undo: oldState,
redo: base.serialize(),
})
-
- Minotaur.watch( app.router.editorView.settings )
- }
+ }
else {
app.controller.hideExtras()
}
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index 76e9da1..bd09dc2 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -91,8 +91,6 @@ var LightControl = View.extend({
redo: this.serialize(),
})
this.initialState = null
-
- Minotaur.watch( app.router.editorView.settings )
},
setMode: function (mode) {