1 files changed, 32 insertions, 6 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index c3589db..210ef6c 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -29,21 +29,46 @@ var EditorToolbar = View.extend({
 	openMediaViewer: function(){
 		this.parent.mediaViewer.show()
 		this.parent.mediaUpload.show()
+		this.resetMode()
 	},
 	
-	resizeMedia: function(e){
-		var state = editor.permissions.toggle("resize")
+	resetMode: function(){
+		this.resizeMedia(false)
+		this.destroyMedia(false)
+	},
+	
+	resetControls: function(){
+		this.parent.wallpaperPicker.hide()
+		this.parent.lightControl.hide()
+	},
+	
+	resizeMedia: function(e, state){
+		if (! state && typeof e == "boolean") {
+			state = e
+			editor.permissions.assign("resize", state)
+		}
+		else {
+			state = editor.permissions.toggle("resize")
+		}
+		! state && editor.permissions.assign("move", true)
 		$(".inuse").removeClass("inuse")
-		$(e.currentTarget).toggleClass("inuse", state)
+		$("[data-role='resize-media']").toggleClass("inuse", state)
 		if (state) {
 			Scenery.resize.hide()
 		}
 	},
 	
-	destroyMedia: function(e){
-		var state = editor.permissions.toggle("destroy")
+	destroyMedia: function(e, state){
+		if (! state && typeof e == "boolean") {
+			state = e
+			editor.permissions.assign("destroy", state)
+		}
+		else {
+			state = editor.permissions.toggle("destroy")
+		}
+		! state && editor.permissions.assign("move", true)
 		$(".inuse").removeClass("inuse")
-		$(e.currentTarget).toggleClass("inuse", state)
+		$("[data-role='destroy-media']").toggleClass("inuse", state)
 		$("body").toggleClass("destroyActive", state)
 	},
 	
@@ -62,6 +87,7 @@ var EditorToolbar = View.extend({
 
 var editor = new function(){
 	this.permissions = new Permissions({
+		'move': true,
 		'resize': false,
 		'destroy': false,
 	})