Merge branch 'master' into master

2017-01-24 21:56:06 +01:00
parent bf0f6eb62d 8a880a3d46
commit f8da0dd490
23 changed files with 237 additions and 113 deletions
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@ -80,8 +80,11 @@ class Formatter
  end

  def link_html(url)
-    link_text = truncate(url.gsub(/\Ahttps?:\/\/(www\.)?/, ''), length: 30)
-    "<a rel=\"nofollow noopener\" target=\"_blank\" href=\"#{url}\">#{link_text}</a>"
+    prefix = url.match(/\Ahttps?:\/\/(www\.)?/).to_s
+    text   = url[prefix.length, 30]
+    suffix = url[prefix.length + 30..-1]
+
+    "<a rel=\"nofollow noopener\" target=\"_blank\" href=\"#{url}\"><span class=\"invisible\">#{prefix}</span><span class=\"ellipsis\">#{text}</span><span class=\"invisible\">#{suffix}</span></a>"
  end

  def hashtag_html(match)