annoying editor modal state stuff

4 files changed, 18 insertions, 4 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index f74b535..92eff2b 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -10,7 +10,7 @@ var EditorSettings = FormView.extend({
 		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
 		"click [data-role='show-collaborators']": 'showCollaborators',
-		"click [data-role='save-project']": 'save',
+		"click [data-role='save-project']": 'clickSave',
 		"click [data-role='clone-project']": 'clone',
 		"click [data-role='clear-project']": 'clear',
 		"click [data-role='destroy-project']": 'destroy',
@@ -171,6 +171,11 @@ var EditorSettings = FormView.extend({
 	  return false
 	},
 	
+	clickSave: function(){
+    this.toggle(false)
+    this.save()
+	},
+	
 	success: function(data){
 		this.$id.val(data._id)
 		this.$name.val(data.name)
@@ -182,8 +187,6 @@ var EditorSettings = FormView.extend({
 		window.history.pushState(null, document.title, "/project/" + data.slug + "/edit")
 
 		this.parent.data = data
-
-    this.toggle(false)
 	},
 
 })
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index c631317..e91da0f 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -23,6 +23,11 @@ var EditorToolbar = View.extend({
 	},
 	
 	toggleSettings: function(){
+	  this.resetMode()
+	  $(".inuse").removeClass("inuse")
+		this.parent.lightControl.hide()
+		this.parent.wallpaperPicker.hide()
+		this.parent.mediaEditor.hide()
 		this.parent.settings.toggle()
 	},
 	
@@ -84,7 +89,9 @@ var EditorToolbar = View.extend({
 		var state = ! $("[data-role='toggle-wallpaper-panel']").hasClass("inuse")
 		this.resetMode()
 		$("[data-role='toggle-wallpaper-panel']").toggleClass("inuse", state)
+		this.parent.mediaEditor.hide()
 		this.parent.lightControl.hide()
+		this.parent.settings.hide()
 		this.parent.wallpaperPicker.toggle(state)
 	},
 	
@@ -92,7 +99,9 @@ var EditorToolbar = View.extend({
 		var state = ! $("[data-role='toggle-light-control']").hasClass("inuse")
 		this.resetMode()
 		$("[data-role='toggle-light-control']").toggleClass("inuse", state)
+		this.parent.mediaEditor.hide()
 		this.parent.wallpaperPicker.hide()
+		this.parent.settings.hide()
 		this.parent.lightControl.toggle(state)
 	},
 	
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 22e32ca..e11f189 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -46,7 +46,6 @@ var EditorView = View.extend({
 	
 	hideExtras: function(){
 		this.mediaEditor.hide()
-		this.settings.toggle(false)
 	}
 
 })
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index 2d32d4f..9b20a43 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -39,6 +39,9 @@ var MediaEditor = FormView.extend({
 	},
 	
 	toggle: function(state) {
+    if (state) {
+      this.parent.settings.toggle()
+    }
     this.$el.toggleClass("active", state);
 	},