1 files changed, 26 insertions, 20 deletions

diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 029252d..2ae5104 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -38,11 +38,11 @@ var MediaViewer = ModalView.extend({
 		this.$deleteMedia = this.$("#deleteMedia")
 		this.$viewMore = this.$(".viewMore")
 		this.$noMedia = this.$(".noMedia")
-		
-		this.$tumblrUrl = this.$("#tumblr-url")
   },
 
+  mode: "user",
 	wallpaperToggle: function(){
+	  this.mode = "wallpaper"
     this.$wallpaperMedia.addClass("active")
     this.$foundMedia.addClass("inactive")
     this.$myMedia.addClass("inactive").removeClass('active')
@@ -51,29 +51,34 @@ var MediaViewer = ModalView.extend({
 	},
 	
 	foundToggle: function(){
+	  this.mode = "found"
     this.$wallpaperMedia.removeClass("active")
     this.$foundMedia.addClass("active")
     this.$myMedia.addClass("inactive").removeClass('active')
     this.$("a").removeClass("active")
     this.$foundToggle.addClass("active")
+    this.parent.mediaUpload.hide()
+    this.parent.mediaTumblr.show()
 	},
 	
 	userToggle: function(){
+	  this.mode = "user"
     this.$wallpaperMedia.removeClass("active")
     this.$foundMedia.removeClass("active")
     this.$myMedia.removeClass("inactive").addClass('active')
     this.$("a").removeClass("active")
     this.$userToggle.addClass("active")
+    this.parent.mediaUpload.show()
+    this.parent.mediaTumblr.hide()
 	},
 
 	show: function(){
 		if (! this.loaded) {
 			this.load()
-			this.loadTrending()
+			// this.loadTrending()
 		}
 		else {
-		  this.parent.cursor.message("media")
-			this.__super__.show.call(this)
+			this.reallyShow()
 		}
 	},
 	
@@ -81,13 +86,26 @@ var MediaViewer = ModalView.extend({
 		this.__super__.hide.call(this)
 		this.deleteArmed(false)
 		this.parent.mediaUpload.hide()
+		this.parent.mediaTumblr.hide()
 		this.parent.cursor.message('start')
 	},
+	
+	reallyShow: function(){
+    this.__super__.show.call(this)
+    if (this.mode == "user") {
+      this.userToggle()
+    }
+    else {
+      this.foundToggle()
+    }
+    this.parent.cursor.message("media")
+	},
 
 	load: function(){
 		$.get("/api/media/user", { offset: this.offset, limit: this.perPage }, this.populate.bind(this))
 	},
-	
+
+/*
 	loadTrending: function(){
     var trending_imagery = [
       'https://d1ycxz9plii3tb.cloudfront.net/post_images/52ec0e20c9dc24f1d8000067/large.jpg',
@@ -121,6 +139,7 @@ var MediaViewer = ModalView.extend({
 		  if (img.complete && ! loaded) { img.onload() }
 		}.bind(this))
 	},
+*/
 	
 	randomize: function(){
 	  var $divs = this.$(".active .container").find(".mediaContainer").toArray()
@@ -157,8 +176,7 @@ var MediaViewer = ModalView.extend({
 		}
 		else  {
 			this.loaded = true
-      this.parent.cursor.message("media")
-			this.__super__.show.call(this)
+			this.reallyShow()
 		}
 	},
 	
@@ -294,16 +312,4 @@ var MediaViewer = ModalView.extend({
 		_followCursor(e)
 	},
 	
-	enterTumblrUrl: function(e){
-		e.stopPropagation()
-		if (e.keyCode !== 13) { return }
-		var url = this.$tumblrUrl.val()
-		Parser.tumblr(url, function(media_list){
-			console.log(media_list)
-			this.$foundMediaContainer.empty()
-			media_list.reverse().forEach(function(media){
-				this.add(media, this.$foundMediaContainer)
-			}.bind(this))
-		}.bind(this))
-	},
 })