merge

1 files changed, 13 insertions, 2 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index a3abc5a..5e0da7e 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -30,6 +30,7 @@ var EditorToolbar = View.extend({
 		this.parent.mediaViewer.show()
 		this.parent.mediaUpload.show()
 		this.resetMode()
+		this.resetControls()
 	},
 	
 	resetMode: function(){
@@ -43,6 +44,7 @@ var EditorToolbar = View.extend({
 	},
 	
 	resizeMedia: function(e, state){
+		this.resetControls()
 		if (! state && typeof e == "boolean") {
 			state = e
 			editor.permissions.assign("resize", state)
@@ -59,6 +61,7 @@ var EditorToolbar = View.extend({
 	},
 	
 	destroyMedia: function(e, state){
+		this.resetControls()
 		if (! state && typeof e == "boolean") {
 			state = e
 			editor.permissions.assign("destroy", state)
@@ -73,11 +76,19 @@ var EditorToolbar = View.extend({
 	},
 	
 	toggleWallpaper: function(){
-		this.parent.wallpaperPicker.toggle()
+		var state = ! $("[data-role='toggle-wallpaper-panel']").hasClass("inuse")
+		this.resetMode()
+		$("[data-role='toggle-wallpaper-panel']").toggleClass("inuse", state)
+		this.parent.lightControl.hide()
+		this.parent.wallpaperPicker.toggle(state)
 	},
 	
 	toggleLightControl: function(){
-		this.parent.lightControl.toggle()
+		var state = ! $("[data-role='toggle-light-control']").hasClass("inuse")
+		this.resetMode()
+		$("[data-role='toggle-light-control']").toggleClass("inuse", state)
+		this.parent.wallpaperPicker.hide()
+		this.parent.lightControl.toggle(state)
 	},
 	
 	editWallText: function(){