Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bugfix, remove debug code

Browse source
This commit is contained in:
Thomas Bruederli 2012-07-26 17:27:08 +02:00
parent f3efd7b95b
commit 5ccca682a8
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/tasklist/tasklist.js
View file

@ -407,7 +407,6 @@ function rcube_tasklist(settings)
// re-sort tags list // re-sort tags list
$(rcmail.gui_objects.tagslist).children('li').sortElements(function(a,b){ $(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; return $.text([a]).toLowerCase() > $.text([b]).toLowerCase() ? 1 : -1;
}); });
} }
@ -496,7 +495,7 @@ function rcube_tasklist(settings)
if ((rec.mask & FILTER_MASK_OVERDUE)) if ((rec.mask & FILTER_MASK_OVERDUE))
div.addClass('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) { if (replace && (li = $('li[rel="'+replace+'"]', rcmail.gui_objects.resultlist)) && li.length) {
li.children('div.taskhead').first().replaceWith(div); li.children('div.taskhead').first().replaceWith(div);
li.attr('rel', rec.id); li.attr('rel', rec.id);
@ -508,12 +507,13 @@ function rcube_tasklist(settings)
.append(div) .append(div)
.append('<ul class="childtasks"></ul>'); .append('<ul class="childtasks"></ul>');
if (rec.parent_id && (parent = $('li[rel="'+rec.parent_id+'"] > ul.childtasks', rcmail.gui_objects.resultlist)) && parent.length) if (!parent || !parent.length)
li.appendTo(parent);
else
li.appendTo(rcmail.gui_objects.resultlist); li.appendTo(rcmail.gui_objects.resultlist);
} }
if (parent && parent.length)
li.appendTo(parent);
if (replace) { if (replace) {
resort_task(rec, li, true); resort_task(rec, li, true);
// TODO: remove the item after a while if it doesn't match the current filter anymore // 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) function insert_list(prop)
{ {
console.log(prop)
var li = $('<li>').attr('id', 'rcmlitasklist'+prop.id) var li = $('<li>').attr('id', 'rcmlitasklist'+prop.id)
.append('<input type="checkbox" name="_list[]" value="'+prop.id+'" checked="checked" />') .append('<input type="checkbox" name="_list[]" value="'+prop.id+'" checked="checked" />')
.append('<span class="handle">&nbsp;</span>') .append('<span class="handle">&nbsp;</span>')

2
plugins/tasklist/tasklist.php
View file

@ -245,7 +245,7 @@ class tasklist extends rcube_plugin
$rec['description'] = ''; $rec['description'] = '';
foreach ($rec as $key => $val) { foreach ($rec as $key => $val) {
if ($val == 'null') if ($val === 'null')
$rec[$key] = null; $rec[$key] = null;
} }