From bcafe5c0310bc54cc3675298b39c5e76dab228cd Mon Sep 17 00:00:00 2001 From: maxpozdeev Date: Mon, 14 Aug 2023 22:06:19 +0300 Subject: [PATCH] * can close task editor on esc key --- src/content/mytinytodo.js | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/content/mytinytodo.js b/src/content/mytinytodo.js index f4c396f..585dfc1 100644 --- a/src/content/mytinytodo.js +++ b/src/content/mytinytodo.js @@ -463,13 +463,14 @@ var mytinytodo = window.mytinytodo = _mtt = { }); $('#tasklist').on('dblclick', '> li.task-row .task-middle, > li.task-row .task-note-block', function(){ - var id = parseInt(getLiTaskId(this)); + let id = parseInt(getLiTaskId(this)); if (id) { //clear selection - if (document.selection && document.selection.empty && document.selection.createRange().text) document.selection.empty(); - else if(window.getSelection) window.getSelection().removeAllRanges(); - - editTask(parseInt(id)); + if (document.selection && document.selection.empty && document.selection.createRange().text) + document.selection.empty(); + else if (window.getSelection) + window.getSelection().removeAllRanges(); + editTask(id); } }); @@ -874,6 +875,7 @@ var mytinytodo = window.mytinytodo = _mtt = { pageBack: function(clicked) { hideAlert(); + $(document).off('keydown.mttback'); // If clicked on back button in settings we'll use history navigation if ( clicked && this.pages.current && this.pages.current.page == 'ajax' && this.pages.current.pageClass == 'settings' && @@ -1773,14 +1775,14 @@ function clearEditForm() function showEditForm(isAdd) { - var form = document.getElementById('taskedit_form'); - if(isAdd) + let form = document.getElementById('taskedit_form'); + if (isAdd) { clearEditForm(); $('#page_taskedit').removeClass('mtt-inedit').addClass('mtt-inadd'); form.isadd.value = 1; - if(_mtt.options.autotag) form.tags.value = _mtt.filter.getTags(); - if($('#task').val() != '') + if (_mtt.options.autotag) form.tags.value = _mtt.filter.getTags(); + if ($('#task').val() != '') { _mtt.db.request('parseTaskStr', { list:curList.id, title:$('#task').val(), tag:_mtt.filter.getTags() }, function(json){ if(!json) return; @@ -1796,6 +1798,11 @@ function showEditForm(isAdd) $('#page_taskedit').removeClass('mtt-inadd').addClass('mtt-inedit'); form.isadd.value = 0; } + $(document).on('keydown.mttback', function(event) { + if (event.keyCode == 27) { //Esc pressed + _mtt.pageBack(true); + } + }); flag.editFormChanged = false; _mtt.pageSet('taskedit');