plugins/tasklist
Thomas Brüderli
bruederli at kolabsys.com
Thu Jul 26 17:27:47 CEST 2012
plugins/tasklist/tasklist.js | 13 ++++++-------
plugins/tasklist/tasklist.php | 2 +-
2 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 5ccca682a841ed99f4e89c010eb2c6e63cfb6c71
Author: Thomas Bruederli <thomas at roundcube.net>
Date: Thu Jul 26 17:27:08 2012 +0200
Bugfix, remove debug code
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 71cca8d..77a37f4 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -407,7 +407,6 @@ function rcube_tasklist(settings)
// re-sort tags list
$(rcmail.gui_objects.tagslist).children('li').sortElements(function(a,b){
- console.log($.text([a]), $.text([b]))
return $.text([a]).toLowerCase() > $.text([b]).toLowerCase() ? 1 : -1;
});
}
@@ -496,7 +495,7 @@ function rcube_tasklist(settings)
if ((rec.mask & FILTER_MASK_OVERDUE))
div.addClass('overdue');
- var li, parent;
+ var li, parent = rec.parent_id ? $('li[rel="'+rec.parent_id+'"] > ul.childtasks', rcmail.gui_objects.resultlist) : null;
if (replace && (li = $('li[rel="'+replace+'"]', rcmail.gui_objects.resultlist)) && li.length) {
li.children('div.taskhead').first().replaceWith(div);
li.attr('rel', rec.id);
@@ -508,12 +507,13 @@ function rcube_tasklist(settings)
.append(div)
.append('<ul class="childtasks"></ul>');
- if (rec.parent_id && (parent = $('li[rel="'+rec.parent_id+'"] > ul.childtasks', rcmail.gui_objects.resultlist)) && parent.length)
- li.appendTo(parent);
- else
+ if (!parent || !parent.length)
li.appendTo(rcmail.gui_objects.resultlist);
}
-
+
+ if (parent && parent.length)
+ li.appendTo(parent);
+
if (replace) {
resort_task(rec, li, true);
// TODO: remove the item after a while if it doesn't match the current filter anymore
@@ -936,7 +936,6 @@ function rcube_tasklist(settings)
*/
function insert_list(prop)
{
- console.log(prop)
var li = $('<li>').attr('id', 'rcmlitasklist'+prop.id)
.append('<input type="checkbox" name="_list[]" value="'+prop.id+'" checked="checked" />')
.append('<span class="handle"> </span>')
diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index 00a42d5..0ba4260 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -245,7 +245,7 @@ class tasklist extends rcube_plugin
$rec['description'] = '';
foreach ($rec as $key => $val) {
- if ($val == 'null')
+ if ($val === 'null')
$rec[$key] = null;
}
More information about the commits
mailing list