diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-17 18:29:49 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-17 18:29:49 -0500 |
| commit | d6c70a990087e24f6243117094e44feeb3d15ae8 (patch) | |
| tree | 472f094ae107b3eaa9f02c2b5240c786360a5ac9 /public/assets/javascripts/rectangles/engine | |
| parent | fab10593b014ca9db2472c21c846838f72e5fc45 (diff) | |
| parent | d5d1f00ff8b3ef4b2465d16abdb8adb6f4613afb (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/rectangles/engine')
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/map/ui_editor.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js index d1b0b89..7308344 100644 --- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js +++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js @@ -184,7 +184,7 @@ Map.UI.Editor = function(map){ app.tube("builder-pick-room", room) // TODO: watch individual scenery object here - Minotaur.watch( app.router.editorView.settings ) + Minotaur.watch( app.controller.settings ) } } if (base.resizing || base.dragging) { |