2 commits - plugins/tasklist

[Thomas Brüderli]

 plugins/tasklist/tasklist.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab3f58b88896999c18e9314d0787c4231d628b0c
Merge: 4d647e0 7672e60
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Sat Jan 19 17:37:04 2013 +0100

    Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube



commit 4d647e014969725f33463b028c444569288833b2
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Sat Jan 19 17:36:32 2013 +0100

    Fix javascript error that prevents delete dialog from being closed (#1551)

diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index f897d0d..daf157e 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -1319,7 +1319,7 @@ function rcube_tasklist_ui(settings)
         rcmail.http_post('task', { action:'delete', t:{ id:rec.id, list:rec.list }, mode:mode, filter:filtermask });
 
         // move childs to parent/root
-        if (mode != 1) {
+        if (mode != 1 && rec.children !== undefined) {
             var parent_node = rec.parent_id ? $('li[rel="'+rec.parent_id+'"] > .childtasks', rcmail.gui_objects.resultlist) : null;
             if (!parent_node || !parent_node.length)
                 parent_node = rcmail.gui_objects.resultlist;