Fix showing ellipsis even when link hasn't been cut off

8 years ago · 6fa4e01139
parent 87830f99e7
commit 6fa4e01139
1 changed files with 2 additions and 1 deletions
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@ -68,8 +68,9 @@ class Formatter
    prefix = url.match(/\Ahttps?:\/\/(www\.)?/).to_s
    text   = url[prefix.length, 30]
    suffix = url[prefix.length + 30..-1]
+    cutoff = url[prefix.length..-1].length > 30

-    "<a rel=\"nofollow noopener\" target=\"_blank\" href=\"#{url}\"><span class=\"invisible\">#{prefix}</span><span class=\"ellipsis\">#{text}</span><span class=\"invisible\">#{suffix}</span></a>"
+    "<a rel=\"nofollow noopener\" target=\"_blank\" href=\"#{url}\"><span class=\"invisible\">#{prefix}</span><span class=\"#{cutoff ? 'ellipsis' : ''}\">#{text}</span><span class=\"invisible\">#{suffix}</span></a>"
  end

  def hashtag_html(match)