BUG: Build tweet HTML w/ jQuery .attr() & .text()

https URLs fixes #181
christianvuerings · Dec 17, 2014 · de4b44a · de4b44a
1 parent 7444fb0
commit de4b44a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/jquery.lifestream.js b/jquery.lifestream.js
@@ -2382,27 +2382,32 @@ $.fn.lifestream.feeds.tumblr = function( config, callback ) {
         return t.replace(
           /([a-z]+:\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig,
           function( m ) {
-            return '<a href="' + m + '">' +
-              ( ( m.length > 25 ) ? m.substr( 0, 24 ) + '...' : m ) +
-              '</a>';
+            return $("<a></a>").attr("href", m).text(
+                ( ( m.length > 25 ) ? m.substr( 0, 24 ) + '...' : m )
+            )[0].outerHTML;
           }
         );
       },
       at = function( t ) {
         return t.replace(
           /(^|[^\w]+)\@([a-zA-Z0-9_]{1,15})/g,
           function( m, m1, m2 ) {
-            return m1 + '<a href="http://twitter.com/' + m2 + '">@' +
-              m2 + '</a>';
+            var elem = ($("<a></a>")
+                     .attr("href", "https://twitter.com/" + m2)
+                     .text(m2))[0].outerHTML;
+            return m1 + elem;
           }
         );
       },
       hash = function( t ) {
         return t.replace(
           /(^|[^\w'"]+)\#([a-zA-Z0-9ÅåÄäÖöØøÆæÉéÈèÜüÊêÛûÎî_]+)/g,
           function( m, m1, m2 ) {
-            return m1 + '<a href="https://twitter.com/hashtag/' +
-            m2 + '?src=hash">#' + m2 + '</a>';
+            var elem = ($("<a></a>")
+                     .attr("href", "https://twitter.com/hashtag/" + m2
+                          + "?src=hash")
+                     .text("#" + m2))[0].outerHTML;
+            return m1 + elem;
           }
         );
       };

diff --git a/src/services/twitter.js b/src/services/twitter.js
@@ -21,27 +21,32 @@
         return t.replace(
           /([a-z]+:\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig,
           function( m ) {
-            return '<a href="' + m + '">' +
-              ( ( m.length > 25 ) ? m.substr( 0, 24 ) + '...' : m ) +
-              '</a>';
+            return $("<a></a>").attr("href", m).text(
+                ( ( m.length > 25 ) ? m.substr( 0, 24 ) + '...' : m )
+            )[0].outerHTML;
           }
         );
       },
       at = function( t ) {
         return t.replace(
           /(^|[^\w]+)\@([a-zA-Z0-9_]{1,15})/g,
           function( m, m1, m2 ) {
-            return m1 + '<a href="http://twitter.com/' + m2 + '">@' +
-              m2 + '</a>';
+            var elem = ($("<a></a>")
+                     .attr("href", "https://twitter.com/" + m2)
+                     .text(m2))[0].outerHTML;
+            return m1 + elem;
           }
         );
       },
       hash = function( t ) {
         return t.replace(
           /(^|[^\w'"]+)\#([a-zA-Z0-9ÅåÄäÖöØøÆæÉéÈèÜüÊêÛûÎî_]+)/g,
           function( m, m1, m2 ) {
-            return m1 + '<a href="https://twitter.com/hashtag/' +
-            m2 + '?src=hash">#' + m2 + '</a>';
+            var elem = ($("<a></a>")
+                     .attr("href", "https://twitter.com/hashtag/" + m2
+                          + "?src=hash")
+                     .text("#" + m2))[0].outerHTML;
+            return m1 + elem;
           }
         );
       };