Merge pull request #166 from ahluntang/master

twitter.js: linkify: detect links with #
christianvuerings · Feb 5, 2014 · d4f0ed6 · d4f0ed6
2 parents 3413dca + 5b4b676
commit d4f0ed6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/services/twitter.js b/src/services/twitter.js
@@ -21,7 +21,7 @@
 
       var link = function( t ) {
         return t.replace(
-          /[a-z]+:\/\/[a-z0-9\-_]+\.[a-z0-9\-_:~%&\?\/.=]+[^:\.,\)\s*$]/ig,
+          /([a-z]+:\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig,
           function( m ) {
             return '<a href="' + m + '">' +
               ( ( m.length > 25 ) ? m.substr( 0, 24 ) + '...' : m ) +