2 commits - plugins/libcalendaring plugins/tasklist

[Thomas Brüderli]

 plugins/libcalendaring/libcalendaring.js |    3 ++-
 plugins/tasklist/tasklist.js             |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2e9c4a65290068de228205310623009a20ba05a0
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Oct 24 11:05:33 2013 +0200

    Fix show-more link: don't add it twice if maxlen and maxlines are both set; show dots before link if text is truncated

diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js
index fcee46e..b69d6bd 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 = ' <a href="#more" onclick="$(this).hide().next().show();return false" class="morelink">'+rcmail.gettext('showmore','libcalendaring')+'</a><span style="display:none">',
+            var morelink = '<span>... <a href="#more" onclick="$(this).parent().hide().next().show();return false" class="morelink">'+rcmail.gettext('showmore','libcalendaring')+'</a></span><span style="display:none">',
                 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';


commit f72b878493f1c47aefaff9994cfd3ebae28cf884
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Oct 24 10:59:01 2013 +0200

    Fix assignment to a new list in edit dialog

diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 2c1a921..198ba82 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -1208,7 +1208,7 @@ function rcube_tasklist_ui(settings)
             }
 
             // task assigned to a new list
-            if (me.selected_task.list && me.selected_task.list != rec.list) {
+            if (me.selected_task.list && listdata[id] && me.selected_task.list != listdata[id].list) {
                 me.selected_task._fromlist = rec.list;
             }