load a tumblr url

3 files changed, 25 insertions, 8 deletions

diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 4af94e5..f3d75bf 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -16,6 +16,7 @@ var MediaViewer = ModalView.extend({
 		'click #randomize': "randomize",
 		'click .mediaContainer': "pick",
 		'click .viewMore': "load",
+		'keydown #tumblr-url': 'enterTumblrUrl',
 	},
 	
 	initialize: function(opt){
@@ -37,6 +38,8 @@ var MediaViewer = ModalView.extend({
 		this.$deleteMedia = this.$("#deleteMedia")
 		this.$viewMore = this.$(".viewMore")
 		this.$noMedia = this.$(".noMedia")
+		
+		this.$tumblrUrl = this.$("#tumblr-url")
   },
 
 	wallpaperToggle: function(){
@@ -290,4 +293,17 @@ var MediaViewer = ModalView.extend({
 		$ants.addClass('edit')
 		_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))
+	},
 })
diff --git a/public/assets/javascripts/ui/lib/Parser.js b/public/assets/javascripts/ui/lib/Parser.js
index ececa78..411f425 100644
--- a/public/assets/javascripts/ui/lib/Parser.js
+++ b/public/assets/javascripts/ui/lib/Parser.js
@@ -169,6 +169,9 @@ var Parser = {
 
   tumblr: function(url, cb){
     var domain = url.replace(/^https?:\/\//,"").split("/")[0]
+    if (domain.indexOf(".") == -1) {
+    	domain += ".tumblr.com"
+    }
     $.ajax({
       type: 'GET', 
       url: "http://" + domain + "/api/read",
@@ -181,7 +184,7 @@ var Parser = {
         var blog = data.tumblelog
         
         data.posts.forEach(parse)
-        cb(parse)
+        cb(media_list)
 
         function parse(post){
           var media, caption, url
@@ -207,7 +210,7 @@ var Parser = {
                   url: post['photo-url-1280'],
                   type: "image",
                   token: "",
-                  thumbnail: photo['photo-url-500'],
+                  thumbnail: post['photo-url-500'],
                   description: caption,
                   width: parseInt(post.width),
                   height: parseInt(post.height),
@@ -218,7 +221,7 @@ var Parser = {
             case 'video':
               url = post['video-source']
               if (url.indexOf("http") !== 0) { break }
-              if (Parser.lookup.youtube.regex.test(url) {
+              if (Parser.lookup.youtube.regex.test(url)) {
                 var id = (url.match(/v=([-_a-zA-Z0-9]{11})/i) || url.match(/youtu.be\/([-_a-zA-Z0-9]{11})/i) || url.match(/embed\/([-_a-zA-Z0-9]{11})/i))[1].split('&')[0];
                 var thumb = "http://i.ytimg.com/vi/" + id + "/hqdefault.jpg"
                 media = {
@@ -234,8 +237,8 @@ var Parser = {
               }
               break
           }
-        })
-        console.log(result)
+        }
+//         console.log(post)
       }
     })
   },
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index e4ae935..df7910c 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -23,9 +23,7 @@
 	</div>
 
 	<div class="foundMedia">
-<!-- 
-	  <input type="text" data-role="tumblr-url">
- -->
+	  <input type="text" id="tumblr-url" placeholder="Enter a Tumblr url!">
 	  <span class="container"></span>
  	</div>