summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2016-06-10 17:32:05 -0400
committerJules Laplace <jules@okfoc.us>2016-06-10 18:37:21 -0400
commitdcd316eda560e87c326a64c2ff05e0f74e02227a (patch)
treed54d13691a265ce80e66aa9da52dfa3a5e2e8007 /public/assets/javascripts/rectangles
parent7f443264d1c30b48cc3923ee6e700facdf0f7214 (diff)
some light QA
Diffstat (limited to 'public/assets/javascripts/rectangles')
-rw-r--r--public/assets/javascripts/rectangles/engine/map/ui/editor.js8
-rw-r--r--public/assets/javascripts/rectangles/util/minotaur.js6
2 files changed, 6 insertions, 8 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/ui/editor.js b/public/assets/javascripts/rectangles/engine/map/ui/editor.js
index 7308344..699597a 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui/editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui/editor.js
@@ -73,7 +73,7 @@ Map.UI.Editor = function(map){
app.tube("builder-destroy-room", room)
// TODO: watch individual scenery object here
- Minotaur.watch( app.router.editorView.settings )
+ Minotaur.watch( (app.router.builderView || app.router.editorView).settings )
return
}
else if (intersects.length) {
@@ -205,13 +205,13 @@ Map.UI.Editor = function(map){
Rooms.rebuild()
// TODO: watch individual scenery object here
- Minotaur.watch( app.router.editorView.settings )
+ Minotaur.watch( (app.router.builderView || app.router.editorView).settings )
}
var intersects = Rooms.filter(function(r){
return r.focused = r.rect.contains(cursor.x.a, cursor.y.a)
})
- if (! intersects.length) {
+ if (! base.dragging && ! intersects.length) {
app.tube("builder-pick-nothing")
}
@@ -247,7 +247,7 @@ Map.UI.Editor = function(map){
Rooms.rebuild()
// TODO: watch individual scenery object here
- Minotaur.watch( app.router.editorView.settings )
+ Minotaur.watch( (app.router.builderView || app.router.editorView).settings )
wheelState = null
}, 250)
diff --git a/public/assets/javascripts/rectangles/util/minotaur.js b/public/assets/javascripts/rectangles/util/minotaur.js
index d165ccc..8b1abfe 100644
--- a/public/assets/javascripts/rectangles/util/minotaur.js
+++ b/public/assets/javascripts/rectangles/util/minotaur.js
@@ -38,7 +38,7 @@
for (var id in base.objects[type]) {
var obj = base.objects[type][id]
if (obj) {
- obj.save(null, function(){ base.hide() }, function(){})
+ obj.save(null, function(){ base.hide() }, function(){ base.hide() })
}
delete base.objects[type][id]
saving = true
@@ -53,9 +53,7 @@
}
base.hide = function () {
- setTimeout(function(){
- base.$el.removeClass()
- }, 500)
+ base.$el.removeClass('saving')
}
base.init();