some light QA

6 files changed, 21 insertions, 11 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();
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index c8c8880..256bffe 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -52,7 +52,7 @@ var BuilderSettings = FormView.extend({
 		this.$name.val( names.join(" ") )
 		this.action = this.createAction
 		
-		window.history.pushState(null, document.title, "/builder/new")
+		window.history.pushState(null, document.title, "/layout/new")
 	},
 	
 	clear: function(){
diff --git a/public/assets/javascripts/ui/builder/BuilderToolbar.js b/public/assets/javascripts/ui/builder/BuilderToolbar.js
index 6c218be..e9dcce3 100644
--- a/public/assets/javascripts/ui/builder/BuilderToolbar.js
+++ b/public/assets/javascripts/ui/builder/BuilderToolbar.js
@@ -60,6 +60,9 @@ var BuilderToolbar = View.extend({
 		var state = map.ui.permissions.toggle("destroy")
 		$(".inuse").removeClass("inuse")
 		$(e.currentTarget).toggleClass("inuse", state)
+		if (! state) {
+		  this.resetPermissions()
+		}
 	},
 
 })
diff --git a/public/assets/javascripts/ui/lib/FormView.js b/public/assets/javascripts/ui/lib/FormView.js
index 33effc8..a952ecb 100644
--- a/public/assets/javascripts/ui/lib/FormView.js
+++ b/public/assets/javascripts/ui/lib/FormView.js
@@ -69,7 +69,9 @@ var FormView = View.extend({
       var errors = this.validate()
       if (errors && errors.length) {
         if (errorCallback) {
-          errorCallback(errors)
+          setTimeout(function(){
+            errorCallback(errors)
+          })
         }
         else {
           this.showErrors(errors)
@@ -77,7 +79,6 @@ var FormView = View.extend({
         return
       }
     }
-    
     var action = typeof this.action == "function" ? this.action() : this.action
     if (! action) return
 
@@ -112,7 +113,9 @@ var FormView = View.extend({
         return
       }
       else {
+        console.log("ok")
         if (successCallback) {
+        console.log("use cb")
           successCallback(response)
         }
         if (this.success) {
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index fdf7c12..7dda058 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -421,6 +421,10 @@ h5 {
 	float: right;
 }
 
+.projectList.about.makeAccountSingleton a {
+  margin: 0 20%;
+}
+
 .page .showcase {
   height:70vh;
 }
@@ -3066,6 +3070,8 @@ a[data-role="forgot-password"] {
   font-size: 13px;
   margin: 5px 0 0 0;
 }
+
+
 .share {
 	display:inline-block;
 	width:100%;