From 0d07356817b70a8d8487d3eab57d5fcea26a4607 Mon Sep 17 00:00:00 2001 From: maxpozdeev Date: Mon, 11 Sep 2023 22:13:11 +0300 Subject: [PATCH] do not open task viewer if click on link in task title --- src/content/mytinytodo.js | 33 ++++++++++++--------------------- src/content/theme/style.css | 13 +------------ 2 files changed, 13 insertions(+), 33 deletions(-) diff --git a/src/content/mytinytodo.js b/src/content/mytinytodo.js index 9a28d2e..1232cce 100644 --- a/src/content/mytinytodo.js +++ b/src/content/mytinytodo.js @@ -13,7 +13,6 @@ var filter = { compl:0, search:'', due:'' }; var sortOrder; //save task order before dragging var searchTimer; var objPrio = {}; -var lastClickedNodeId = 0; var flag = { needAuth: false, isLogged: false, @@ -456,22 +455,28 @@ var mytinytodo = window.mytinytodo = _mtt = { editTask(id); }); + if (this.options.touchDevice) { + this.options.viewTaskOnClick = true; + } + + if (this.options.viewTaskOnClick) { + $('#mtt').addClass('view-task-on-click'); + } + // tasklist handlers - $("#tasklist").on('click', '> li.task-row .task-middle', function(e) { + $("#tasklist").on('click', '> li.task-row .task-title', function(e) { if ( findParentNode(e.target, 'A') ) { return; //ignore clicks on links } - var li = findParentNode(this, 'LI'); + const li = findParentNode(this, 'LI'); if (li && li.id) { if (e.altKey) { viewTask(li.dataset.id); return; } - if (lastClickedNodeId && li.id != lastClickedNodeId) { - $('#'+lastClickedNodeId).removeClass('clicked'); + if (_mtt.options.viewTaskOnClick) { + viewTask(li.dataset.id); } - lastClickedNodeId = li.id; - $(li).toggleClass('clicked'); } }); @@ -487,20 +492,6 @@ var mytinytodo = window.mytinytodo = _mtt = { } }); - if (this.options.touchDevice) { - this.options.viewTaskOnClick = true; - } - - if (this.options.viewTaskOnClick) { - $('#mtt').addClass('view-task-on-click'); - $('#tasklist').on('click', '> li.task-row .task-title', function(){ - let id = parseInt(getLiTaskId(this)); - if (id) { - viewTask(id); - } - }); - } - $('#tasklist').on('click', '.taskactionbtn', function(){ var id = parseInt(getLiTaskId(this)); if(id) taskContextMenu(this, id); diff --git a/src/content/theme/style.css b/src/content/theme/style.css index 533688f..9fa94f0 100644 --- a/src/content/theme/style.css +++ b/src/content/theme/style.css @@ -1343,18 +1343,7 @@ li.mtt-item-hidden { display:none; } #tasklist li.task-row .task-through { white-space:nowrap; overflow:hidden; text-overflow:ellipsis; } #tasklist li.task-row.task-expanded .task-note-block { display:none; } -/* - #tasklist li.task-row.clicked { - border:1px solid var(--color-tasklist-row-expanded-border); - border-radius: 3px; - } - #tasklist li.task-row.task-has-note.clicked .task-block { - border-bottom: 1px solid var(--color-tasklist-row-inter-border); - } - #tasklist li.task-row.clicked .task-actions { display:block; } - #tasklist li.task-row.clicked .task-through { white-space:normal; display:inline; } - #tasklist li.task-row.clicked.task-has-note .task-note-block { display:block; } -*/ + .task-toggle { display:none; } #tasklist .mtt-task-placeholder { line-height:1rem; padding-top:0.6rem; padding-bottom:0.6rem; } #tasklist .ui-sortable-helper { box-shadow:0px 0px 3px #555; }