Merge branch 'master' of github.com:okfocus/vvalls

1 files changed, 29 insertions, 8 deletions

diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 7cfa863..436c0cb 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -6,23 +6,33 @@ var MediaViewer = ModalView.extend({
 	
 	events: {
 		'click .foundToggle': "foundToggle",
-		'click .yourMedia': "userToggle",
+		'click .userToggle': "userToggle",
 		'click #deleteMedia': "deleteArmed",
 		'click .mediaContainer': "pick",
 	},
 	
+	initialize: function(opt){
+		this.__super__.initialize.call(this)
+		this.parent = opt.parent
+		this.$foundMedia = this.$(".foundMedia")
+		this.$myMedia = this.$(".myMedia")
+		this.$foundToggle = this.$(".foundToggle")
+		this.$userToggle = this.$(".userToggle")
+		this.$deleteMedia = this.$("#deleteMedia")
+	},
+
 	foundToggle: function(){
-    this.$(".foundMedia").addClass("active");
-    this.$(".myMedia").addClass("inactive");
+    this.foundMedia.addClass("active");
+    this.myMedia.addClass("inactive");
     this.$("a").removeClass("active");
-    this.$(".foundToggle").addClass("active");
+    this.foundToggle.addClass("active");
 	},
 	
 	userToggle: function(){
-    this.$(".foundMedia").removeClass("active");
-    this.$(".myMedia").removeClass("inactive");
+    this.foundMedia.removeClass("active");
+    this.myMedia.removeClass("inactive");
     this.$("a").removeClass("active");
-    this.$(".yourMedia").addClass("active");
+    this.userToggle.addClass("active");
 	},
 
 	show: function(){
@@ -46,7 +56,12 @@ var MediaViewer = ModalView.extend({
 
 	populate: function(data){
 		this.loaded = true
-		data && data.forEach(this.add.bind(this))
+		if (data && data.length) {
+		  data.forEach(this.add.bind(this))
+		}
+		else {
+		  this.$deleteMedia.hide()
+		}
 		this.__super__.show.call(this)
 	},
 	
@@ -78,6 +93,7 @@ var MediaViewer = ModalView.extend({
 		$span.append(image)
 
 		this.$(".myMedia").prepend($span)		
+    this.$deleteMedia.show()
 	},
 
 	deleteIsArmed: false,
@@ -112,6 +128,11 @@ var MediaViewer = ModalView.extend({
 		if (this.deleteIsArmed) {
 			this.destroy(media._id)
 			$target.remove()
+
+			if ($(".myMedia .mediaContainer").length == 0) {
+        this.$deleteMedia.hide()
+        this.deleteArmed(false)
+			}
 			return
 		}