load a tumblr url

1 files changed, 8 insertions, 5 deletions

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)
       }
     })
   },