toggling map

2 files changed, 14 insertions, 5 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index 99ede82..3a47dab 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -66,8 +66,8 @@ var Map = function(opt){
 		canvas.height = base.dimensions.b = window.innerHeight
 	}
 		
-	base.toggle = function(){
-		$(base.el).toggle()
+	base.toggle = function(state){
+		$(base.el).toggle(state)
 	}
 
 }
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 0b1da0b..9837304 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -30,9 +30,11 @@ var EditorToolbar = View.extend({
 		}
 	},
 	
-	toggleMap: function(){
-		var state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
-		this.resetControls()
+	toggleMap: function(state){
+		if (typeof state != "boolean") {
+		  state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
+      this.resetControls()
+		}
     $("[data-role='toggle-map-view']").toggleClass("inuse", state)
 		map.toggle(state)
 		$("#minimap").toggleClass("hide", state)
@@ -41,6 +43,7 @@ var EditorToolbar = View.extend({
 	
 	toggleSettings: function(){
 // 	  this.resetMode()
+    this.toggleMap(false)
     this.parent.textEditor.hide()
 		this.parent.presets.hide()
 		this.parent.lightControl.hide()
@@ -54,6 +57,7 @@ var EditorToolbar = View.extend({
 		this.parent.mediaUpload.show()
 		this.resetMode()
 		this.resetControls()
+		this.toggleMap(false)
 	},
 
 	resetMode: function(){
@@ -67,6 +71,7 @@ var EditorToolbar = View.extend({
 	
 	resetControls: function(){
 	  $(".inuse").removeClass("inuse")
+    this.toggleMap(false)
     this.parent.textEditor.hide()
 		this.parent.wallpaperPicker.hide()
 		this.parent.presets.hide()
@@ -110,6 +115,7 @@ var EditorToolbar = View.extend({
     this.parent.textEditor.hide()
 		this.parent.settings.hide()
 		this.parent.presets.hide()
+		this.toggleMap(false)
 		this.parent.wallpaperPicker.toggle(state)
 	},
 	
@@ -122,6 +128,7 @@ var EditorToolbar = View.extend({
     this.parent.textEditor.hide()
 		this.parent.settings.hide()
 		this.parent.presets.hide()
+		this.toggleMap(false)
 		this.parent.lightControl.toggle(state)
 	},
 	
@@ -134,6 +141,7 @@ var EditorToolbar = View.extend({
 		this.parent.lightControl.hide()
 		this.parent.settings.hide()
 		this.parent.presets.hide()
+		this.toggleMap(false)
 		this.parent.textEditor.toggle(state)
   },
 
@@ -146,6 +154,7 @@ var EditorToolbar = View.extend({
     this.parent.textEditor.hide()
 		this.parent.settings.hide()
 		this.parent.lightControl.hide()
+		this.toggleMap(false)
 		this.parent.presets.toggle(state)
 	},
 })