diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-08-29 23:15:19 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-08-29 23:15:19 -0400 |
| commit | ee7e1ccdeaddef9ac83e91519187d500a96ffd70 (patch) | |
| tree | 7cbd2b4d4c38fcd5b9740a1694f8949d0dccade2 | |
| parent | 20ffd893bf7acc9de6d7cf7a22306de942196ff0 (diff) | |
| parent | 63b0195c88882eb4714fa29d28b3db53f9a44a75 (diff) | |
merge
| -rw-r--r-- | public/assets/javascripts/rectangles/models/wall.js | 8 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/editor/LightControl.js | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js index 6043181..469a19f 100644 --- a/public/assets/javascripts/rectangles/models/wall.js +++ b/public/assets/javascripts/rectangles/models/wall.js @@ -70,7 +70,10 @@ 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() base.wallpaper(Scenery.nextWallpaper) @@ -81,6 +84,9 @@ undo: oldState, redo: base.serialize(), }) + + // TODO: watch individual scenery object here + 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 661ceb2..bd622fe 100644 --- a/public/assets/javascripts/ui/editor/LightControl.js +++ b/public/assets/javascripts/ui/editor/LightControl.js @@ -90,7 +90,11 @@ var LightControl = View.extend({ undo: this.initialState, redo: this.serialize(), }) + this.initialState = null + + // TODO: watch individual wall object here + Minotaur.watch( app.router.editorView.settings }, setMode: function (mode) { |