4 files changed, 36 insertions, 25 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 6be068b..4b30228 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -34,6 +34,7 @@ var EditorToolbar = View.extend({
 	},
 	
 	deleteMedia: function(){
+    $("body").toggleClass("deleteActive", isActive);
 	},
 	
 	toggleWallpaper: function(){
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 3911d3b..4ae6f97 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -1,13 +1,13 @@
 
 var MediaViewer = ModalView.extend({
 	el: ".mediaDrawer.mediaViewer",
-	createAction: "/api/docs/new",
-	updateAction: "/api/docs/edit",
-	destroyAction: "/api/docs/destroy",
+	destroyAction: "/api/media/destroy",
 	
 	events: {
 		'click .foundToggle': "foundToggle",
 		'click .yourMedia': "userToggle",
+		'click #deleteMedia': "deleteArmed",
+		'mousedown .mediaContainer': "pick",
 	},
 
 	foundToggle: function(){
@@ -69,11 +69,35 @@ var MediaViewer = ModalView.extend({
 		this.$(".myMedia").prepend($span)		
 	},
 
-	destroy: function(name, cb){
+	deleteIsArmed: false,
+	deleteArmed: function(e, state){
+		if (typeof state != "boolean") {
+			state = ! this.deleteIsArmed
+		}
+		console.log(state)
+		this.deleteIsArmed = state
+		$("body").toggleClass("deleteArmed", state)
+	},
+	
+	pick: function(e){
+		var target = e.currentTarget
+		var $target = $(target)
+		var media = $target.data('media')
+
+		if (this.deleteIsArmed) {
+			this.destroy(media._id)
+			$target.remove()
+		}
+		else {
+			// pick this image ...
+		}
+	},
+
+	destroy: function(_id, cb){
 		$.ajax({
 			type: "delete",
 			url: this.destroyAction,
-			data: { name: name, _csrf: $("[name=_csrf]").val() }
+			data: { _id: _id, _csrf: $("[name=_csrf]").val() }
 		}).complete(cb || function(){})
 	},
 
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 59dc7dd..ffbd935 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -3,6 +3,7 @@ var WallpaperPicker = View.extend({
 	el: ".wallpaper",
 	
 	events: {
+		"click .paper1": 'pick',
 	},
 
 	toggle: function(){
@@ -10,5 +11,10 @@ var WallpaperPicker = View.extend({
     // toggle the class that makes the cursor a paintbucket
     // $("body").removeClass("pastePaper");
 	},
+	
+	pick: function(e){
+    $("body").toggleClass("pastePaper");
+    $(e.currentTarget).toggleClass("active");
+	}
 
 })
diff --git a/public/assets/javascripts/ui/z_misc.js b/public/assets/javascripts/ui/z_misc.js
index f2620b7..c0f7983 100644
--- a/public/assets/javascripts/ui/z_misc.js
+++ b/public/assets/javascripts/ui/z_misc.js
@@ -59,22 +59,6 @@ function bind () {
     $(this).toggleClass('hidden');
   });
 
-  $(".paper1").click(function(){
-    $("body").toggleClass("pastePaper");
-    $(this).toggleClass("active");
-  });
-  
-  $(".icon-ios7-sunny-outline").clickToToggle(function(isActive){
-    $(".lightcontrol").toggleClass("active", isActive);
-  });
-  $(".delete-image-toggle").clickToToggle(function(isActive){
-    $("body").toggleClass("deleteActive", isActive);
-  });
-  $(".icon-key").clickToToggle(function(isActive){
-    $(".settings").toggleClass("active", isActive);
-  });
-
-  
   
   $(".edit-text-toggle").clickToToggle(function(isActive){
     $(".image").toggleClass("editText", isActive);
@@ -91,10 +75,6 @@ function bind () {
     $("#moveText").toggleClass("show");
   });
   
-  
-  $(".deleteArmed .mediaContainer").click(function(){
-    $(this).addClass("deleted");
-  });
 
   $(document).on("click", ".icon-close", disable_mode)