1 files changed, 14 insertions, 7 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index e2ed341..b51d8f2 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -3,6 +3,7 @@ var MediaViewer = ModalView.extend({
 	el: ".mediaDrawer.mediaViewer",
 	destroyAction: "/api/media/destroy",
 	usesFileUpload: true,
+	loaded: false,
 	
 	events: {
 		'click .foundToggle': "foundToggle",
@@ -19,7 +20,7 @@ var MediaViewer = ModalView.extend({
 		this.$foundMedia = this.$(".foundMedia")
 		this.$foundToggle = this.$(".foundToggle")
 		this.$deleteMedia = this.$("#deleteMedia")
-	},
+  },
 
 	foundToggle: function(){
     this.$foundMedia.addClass("active");
@@ -52,9 +53,7 @@ var MediaViewer = ModalView.extend({
 	},
 
 	load: function(){
-		$.get("/api/media/user", function(data){
-		  this.populate()
-		}.bind(this))
+		$.get("/api/media/user", this.populate.bind(this))
 	},
 	
 	loadTrending: function(){
@@ -90,11 +89,20 @@ var MediaViewer = ModalView.extend({
 		  if (img.complete && ! loaded) { img.onload() }
 		}.bind(this))
 	},
+	
+	randomize: function(){
+    var media_data = $(".mediaContainer").toArray().map(function(el){
+      return $(el).data("media")
+    })
+    Scenery.randomize( media_data )
+  },
 
 	populate: function(data){
 		this.loaded = true
 		if (data && data.length) {
-		  data.forEach(this.add.bind(this))
+		  data.forEach(function(media){
+		    this.add(media, this.$myMedia)
+		  }.bind(this))
       this.$deleteMedia.show()
 		}
 		else {
@@ -104,7 +112,6 @@ var MediaViewer = ModalView.extend({
 	},
 	
 	add: function(media, $container){
-	  $container = $container || this.$myMedia
 		var image = new Image ()
 		var $span = $("<span>")
 		$span.addClass("mediaContainer")
@@ -131,7 +138,7 @@ var MediaViewer = ModalView.extend({
 		$span.data("media", media)
 		$span.append(image)
 
-		$container.prepend($span)		
+		$container.prepend($span)
 	},
 
 	deleteIsArmed: false,