unfocus ui on esc

3 files changed, 13 insertions, 4 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index 3a47dab..64372c5 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -67,7 +67,7 @@ var Map = function(opt){
 	}
 		
 	base.toggle = function(state){
-		$(base.el).toggle(state)
+		return $(base.el).toggle(state).is(':visible')
 	}
 
 }
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 44e416d..9d69990 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -26,6 +26,13 @@ Map.UI.Editor = function(map){
 		resize: true,
 		destroy: false,
 	})
+
+	base.blur = function(){
+		Rooms.forEach(function(r){
+			return r.focused = false
+		})
+		app.tube("builder-pick-nothing")
+	}
 	
 	//
 	
@@ -190,7 +197,7 @@ Map.UI.Editor = function(map){
       })
       Rooms.rebuild()
     }
-		
+
 		var intersects = Rooms.filter(function(r){
 			return r.focused = r.rect.contains(cursor.x.a, cursor.y.a)
 		})
@@ -207,7 +214,7 @@ Map.UI.Editor = function(map){
 		var cursor = base.mouse.cursor
 
 		var intersects = Rooms.filter(function(r){
-			return r.focused = r.rect.contains(cursor.x.a, cursor.y.a)
+			return r.focused // = r.rect.contains(cursor.x.a, cursor.y.a)
 		})
 		
 		if (intersects.length) {
@@ -234,4 +241,5 @@ Map.UI.Editor = function(map){
 	
 	function rightclick (e){
 	}
+
 }
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 9c2f3d3..a460bbf 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -35,7 +35,8 @@ var EditorToolbar = View.extend({
 //       this.resetControls()
 // 		}
 //     $("[data-role='toggle-map-view']").toggleClass("inuse", state)
-		map.toggle(state)
+		var state = map.toggle(state)
+		if (state) { map.ui.blur() }
 		$("#minimap").toggleClass("hide", state)
 		this.parent.info.toggle(state)
 	},