summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles/engine/map/ui_editor.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-11-05 18:13:59 -0500
committerJules Laplace <jules@okfoc.us>2014-11-05 18:13:59 -0500
commit22c4fd94cd4b3f5f881f0ad91597b7c208e89eff (patch)
tree910f9273c2de0c49b77e411b1c0a6cf5efd8c108 /public/assets/javascripts/rectangles/engine/map/ui_editor.js
parent64748a6d55f1e4d08270367767b631b724833b19 (diff)
parent69cf6a5005dcd0e7fcebcc1db9bd290b5fb63ed1 (diff)
merge
Diffstat (limited to 'public/assets/javascripts/rectangles/engine/map/ui_editor.js')
-rw-r--r--public/assets/javascripts/rectangles/engine/map/ui_editor.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 1ab9c73..c838b8b 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -70,6 +70,9 @@ Map.UI.Editor = function(map){
Rooms.remove(room)
app.tube("builder-destroy-room", room)
+
+ // TODO: watch individual scenery object here
+ Minotaur.watch( app.router.editorView.settings )
return
}
else if (intersects.length) {
@@ -178,6 +181,9 @@ Map.UI.Editor = function(map){
Rooms.rebuild()
app.tube("builder-pick-room", room)
+
+ // TODO: watch individual scenery object here
+ Minotaur.watch( app.router.editorView.settings )
}
}
if (base.resizing || base.dragging) {
@@ -196,6 +202,9 @@ Map.UI.Editor = function(map){
redo: base.dragging.copy()
})
Rooms.rebuild()
+
+ // TODO: watch individual scenery object here
+ Minotaur.watch( app.router.editorView.settings )
}
var intersects = Rooms.filter(function(r){
@@ -231,6 +240,10 @@ Map.UI.Editor = function(map){
redo: intersects[0].copy()
})
Rooms.rebuild()
+
+ // TODO: watch individual scenery object here
+ Minotaur.watch( app.router.editorView.settings )
+
wheelState = null
}, 250)
}