From 2e9c4a65290068de228205310623009a20ba05a0 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Thu, 24 Oct 2013 11:05:33 +0200 Subject: [PATCH] Fix show-more link: don't add it twice if maxlen and maxlines are both set; show dots before link if text is truncated --- plugins/libcalendaring/libcalendaring.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js index fcee46e9..b69d6bd6 100644 --- a/plugins/libcalendaring/libcalendaring.js +++ b/plugins/libcalendaring/libcalendaring.js @@ -245,7 +245,7 @@ function rcube_libcalendaring(settings) // limit visible text length if (maxlen) { - var morelink = ' '+rcmail.gettext('showmore','libcalendaring')+'', + var morelink = '... '+rcmail.gettext('showmore','libcalendaring')+'', lines = html.split(/\r?\n/), words, out = '', len = 0; @@ -264,6 +264,7 @@ function rcube_libcalendaring(settings) if (len > maxlen) { out += morelink; maxlen = html.length * 2; + maxlines = 0; } } out += '\n';