diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-08-29 23:16:52 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-08-29 23:16:52 -0400 |
| commit | c35972eaeba860dfd82ed7a154048e35755ccec3 (patch) | |
| tree | 0d1767c1f4ae61d2e81cfd5a5c80e782f1ef1ccf | |
| parent | ee7e1ccdeaddef9ac83e91519187d500a96ffd70 (diff) | |
| parent | bc6382cf78bbabbf1f8ade5e8d61b71d59c22c60 (diff) | |
merge
| -rw-r--r-- | public/assets/javascripts/rectangles/models/wall.js | 4 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/editor/LightControl.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js index 469a19f..1a3ef7c 100644 --- a/public/assets/javascripts/rectangles/models/wall.js +++ b/public/assets/javascripts/rectangles/models/wall.js @@ -72,7 +72,7 @@ }) // TODO: watch individual scenery object here - Minotaur.watch( app.router.editorView.settings + Minotaur.watch( app.router.editorView.settings ) } else if (Scenery.nextWallpaper) { var oldState = base.serialize() @@ -86,7 +86,7 @@ }) // TODO: watch individual scenery object here - Minotaur.watch( app.router.editorView.settings + 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 bd622fe..d975180 100644 --- a/public/assets/javascripts/ui/editor/LightControl.js +++ b/public/assets/javascripts/ui/editor/LightControl.js @@ -94,7 +94,7 @@ var LightControl = View.extend({ this.initialState = null // TODO: watch individual wall object here - Minotaur.watch( app.router.editorView.settings + Minotaur.watch( app.router.editorView.settings ) }, setMode: function (mode) { |