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

Fix race conditions in Tasks UI that can cause drag-n-drop issues (Bifrost#T15766)

Browse source
This commit is contained in:
Aleksander Machniak 2017-02-13 09:56:47 +01:00
parent b5ceae7d2d
commit 159025d142
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/tasklist/tasklist.js
View file

@ -325,13 +325,14 @@ function rcube_tasklist_ui(settings)
// quick-add a task
$(rcmail.gui_objects.quickaddform).submit(function(e){
if (saving_lock)
return false;
var tasktext = this.elements.text.value,
rec = { id:-(++idcount), title:tasktext, readonly:true, mask:0, complete:0 };
if (tasktext && tasktext.length) {
save_task({ tempid:rec.id, raw:tasktext, list:me.selected_list }, 'new');
render_task(rec);
$('#listmessagebox').hide();
}
@ -1218,6 +1219,9 @@ function rcube_tasklist_ui(settings)
oldparent = oldrec ? (oldrec._old_parent_id || oldrec.parent_id) : null,
list = me.tasklists[rec.list];
if (!id || !list)
return;
if (oldindex >= 0)
listindex[oldindex] = id;
else
@ -1387,6 +1391,7 @@ function rcube_tasklist_ui(settings)
if (saving_lock) {
rcmail.set_busy(false, null, saving_lock);
$('button.ui-button:ui-button').button('option', 'disabled', false);
saving_lock = null;
}
}

5
plugins/tasklist/tasklist.php
View file

@ -333,7 +333,10 @@ class tasklist extends rcube_plugin
}
// update parent task to adjust list of children
if (!empty($oldrec['parent_id'])) {
$refresh[] = $this->driver->get_task(array('id' => $oldrec['parent_id'], 'list' => $rec['list']));
$parent = array('id' => $oldrec['parent_id'], 'list' => $rec['list']);
if ($parent = $this->driver->get_task()) {
$refresh[] = $parent;
}
}
}