media upload working

1 files changed, 25 insertions, 9 deletions

diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index cd58231..96d7cf7 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -10,7 +10,7 @@ var MediaViewer = ModalView.extend({
 			this.load()
 		}
 		else {
-			this.__super__.show()
+			this.__super__.show.call(this)
 		}
 	},
 
@@ -19,14 +19,30 @@ var MediaViewer = ModalView.extend({
 	},
 
 	populate: function(data){
-		data.forEach($.proxy(function(room){
-			var $span = $("<span>")
-			$span.data("slug", room.slug)
-			$span.css("background-image", "url(" + room.photo + ")")
-			
-			this.$templates.append($span)
-		}, this))
-		this.__super__.show()
+		data.forEach($.proxy(this.add, this))
+
+		this.__super__.show.call(this)
+	},
+	
+	add: function(media){
+		var image = new Image ()
+		var $span = $("<span>")
+		$span.addClass("mediaContainer")
+		switch (media.type) {
+			case 'image':
+				image.src = media.url
+				break
+
+			case 'youtube':
+			case 'vimeo':
+				image.src = media.thumbnail
+				break
+		}
+		
+		$span.data("media", media)
+		$span.append(image)
+
+		this.$(".myMedia").prepend($span)		
 	},
 
 	destroy: function(name, cb){