Merge pull request twitter-archive#8 from howardr/master

Use display url in autoLinkUrlsCustom if urlEntities array is provided as an option
keitaf · Aug 16, 2011 · 54547a9 · 54547a9
2 parents 3e4b850 + 2f95fb9
commit 54547a9
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/test/tests.js b/test/tests.js
@@ -46,4 +46,18 @@ test("twttr.txt.autolink", function() {
   ok(twttr.txt.autoLink("#hi", { hash: "!" }).match(/<a[^>]+>!hi<\/a>/), "Override hash");
   ok(twttr.txt.autoLink("#hi", { preText: "<b>" }).match(/<a[^>]+>#<b>hi<\/a>/), "Override preText");
   ok(twttr.txt.autoLink("#hi", { postText: "</b>" }).match(/<a[^>]+>#hi<\/b><\/a>/), "Override postText");
-});
+
+  // url entities
+  ok(twttr.txt.autoLink("http://t.co/0JG5Mcq", {
+    urlEntities: [{
+      "url": "http://t.co/0JG5Mcq",
+      "display_url": "blog.twitter.com/2011/05/twitte…",
+      "expanded_url": "http://blog.twitter.com/2011/05/twitter-for-mac-update.html",
+      "indices": [
+        84,
+        103
+      ]
+    }]
+  }).match(/<a href="http:\/\/t.co\/0JG5Mcq"[^>]+>blog.twitter.com\/2011\/05\/twitte…<\/a>/), 'Use display url from url entities');
+
+});
diff --git a/test/twitter-text-conformance b/test/twitter-text-conformance
diff --git a/twitter-text.js b/twitter-text.js
@@ -408,6 +408,15 @@ if (!window.twttr) {
       delete options.urlClass;
     }
 
+    // remap url entities to hash
+    var urlEntities, i, len;
+    if(options.urlEntities) {
+      urlEntities = {};
+      for(i = 0, len = options.urlEntities.length; i < len; i++) {
+        urlEntities[options.urlEntities[i].url] = options.urlEntities[i];
+      }
+    }
+
     delete options.suppressNoFollow;
     delete options.suppressDataScreenName;
     delete options.listClass;
@@ -429,8 +438,14 @@ if (!window.twttr) {
           htmlAttrs: htmlAttrs,
           url: twttr.txt.htmlEscape(url)
         };
+        if(urlEntities && urlEntities[url] && urlEntities[url].display_url) {
+          d.displayUrl = twttr.txt.htmlEscape(urlEntities[url].display_url);
+        }
+        else {
+          d.displayUrl = d.url;
+        }
 
-        return stringSupplant("#{before}<a href=\"#{url}\"#{htmlAttrs}>#{url}</a>", d);
+        return stringSupplant("#{before}<a href=\"#{url}\"#{htmlAttrs}>#{displayUrl}</a>", d);
       } else {
         return all;
       }