Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / Mapstraction / usermap.js

diff --git a/plugins/Mapstraction/usermap.js b/plugins/Mapstraction/usermap.js
index 4b7a6c26b4adf08a2e9eadefb406bbe7d6d3b893..763a537d2ef21edd80270a9a0bf13a31ba341db2 100644 (file)
--- a/plugins/Mapstraction/usermap.js
+++ b/plugins/Mapstraction/usermap.js
@@ -28,15 +28,6 @@ function scrapeUser()
      };
 }
 
-function getMicroformatValue(element)
-{
-    if(element[0].tagName.toLowerCase() == 'abbr'){
-        return element.attr('title');
-    }else{
-        return element.text();
-    }
-}
-
 function getNoticeFromElement(noticeElement)
 {
     var notice = {};
@@ -48,7 +39,7 @@ function getNoticeFromElement(noticeElement)
             parseFloat(latlon[1])] };
     }
 
-    notice['html'] = noticeElement.find(".entry-content").html();
+    notice['html'] = noticeElement.find(".e-content").html();
     notice['url'] = noticeElement.find("a.timestamp").attr('href');
     notice['created_at'] = noticeElement.find("abbr.published").text();
 
@@ -104,7 +95,7 @@ function showMapstraction(element, notices) {
           pt = new mxn.LatLonPoint(lat, lon);
           mkr = new mxn.Marker(pt);
 
-          mkr.setIcon(n['user']['profile_image_url']);
+          mkr.setIcon(n['user']['profile_image_url'], [24, 24]);
           mkr.setInfoBubble('<a href="'+ n['user']['profile_url'] + '">' + n['user']['screen_name'] + '</a>' + ' ' + n['html'] +
                             '<br/><a href="'+ n['url'] + '">'+ n['created_at'] + '</a>');