From 7e56c845fe5263702d5312448cd2e8e6f1aa3184 Mon Sep 17 00:00:00 2001 From: John Livingston Date: Thu, 9 May 2024 13:54:42 +0200 Subject: [PATCH] Task lists WIP: * Fix drag & drop --- conversejs/custom/plugins/tasks/muc-task-lists-view.js | 6 ++++-- conversejs/custom/plugins/tasks/templates/muc-task-list.js | 2 +- conversejs/custom/plugins/tasks/templates/muc-task.js | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conversejs/custom/plugins/tasks/muc-task-lists-view.js b/conversejs/custom/plugins/tasks/muc-task-lists-view.js index 58cf9af9..8b436f5a 100644 --- a/conversejs/custom/plugins/tasks/muc-task-lists-view.js +++ b/conversejs/custom/plugins/tasks/muc-task-lists-view.js @@ -112,9 +112,11 @@ export default class MUCTaskListsView extends CustomElement { } _handleDragStart (ev) { - if (!this._isATaskEl(ev.target)) { return } + // The draggable=true is on a livechat-converse-muc-task child + const possibleTaskEl = ev.target.parentElement + if (!this._isATaskEl(possibleTaskEl)) { return } console.log('Starting to drag a task...') - this.currentDraggedTask = ev.target + this.currentDraggedTask = possibleTaskEl this._resetDropOver() } diff --git a/conversejs/custom/plugins/tasks/templates/muc-task-list.js b/conversejs/custom/plugins/tasks/templates/muc-task-list.js index e6def70e..70b22a89 100644 --- a/conversejs/custom/plugins/tasks/templates/muc-task-list.js +++ b/conversejs/custom/plugins/tasks/templates/muc-task-list.js @@ -67,7 +67,7 @@ export default function tplMucTaskList (el, tasklist) { ${el.collapsed ? '' : repeat(tasks, (task) => task.get('id'), (task) => { - return html`` + return html`` }) } diff --git a/conversejs/custom/plugins/tasks/templates/muc-task.js b/conversejs/custom/plugins/tasks/templates/muc-task.js index d3f8f69a..f869394e 100644 --- a/conversejs/custom/plugins/tasks/templates/muc-task.js +++ b/conversejs/custom/plugins/tasks/templates/muc-task.js @@ -9,7 +9,7 @@ export function tplMucTask (el, task) { const doneId = 'livechat-task-done-id-' + task.get('id') return !el.edit ? html` -
+