web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve confirm modal keydown listeners

Browse Source
This commit is contained in:
yflory
2020-02-10 18:33:59 +01:00
parent c0e9e86a9e
commit 44de8a41a1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/common-interface.js
View File

@@ -70,6 +70,7 @@ define([
if (typeof(yes) === 'function') { yes(e); } if (typeof(yes) === 'function') { yes(e); }
break; break;
} }
$(el || window).off('keydown', handler);
}; };
$(el || window).keydown(handler); $(el || window).keydown(handler);
@@ -587,7 +588,7 @@ define([
$ok.click(); $ok.click();
}, function () { }, function () {
$cancel.click(); $cancel.click();
}); }, frame);
document.body.appendChild(frame); document.body.appendChild(frame);
setTimeout(function () { setTimeout(function () {

4
www/common/drive-ui.js
View File

@@ -3345,7 +3345,9 @@ define([
// in history mode we want to focus the version number input // in history mode we want to focus the version number input
if (!history.isHistoryMode && !APP.mobile()) { if (!history.isHistoryMode && !APP.mobile()) {
var st = $tree.scrollTop() || 0; var st = $tree.scrollTop() || 0;
$tree.find('#cp-app-drive-tree-search-input').focus(); if (!$('.alertify').length) {
$tree.find('#cp-app-drive-tree-search-input').focus();
}
$tree.scrollTop(st); $tree.scrollTop(st);
} }
$tree.find('#cp-app-drive-tree-search-input')[0].selectionStart = getSearchCursor(); $tree.find('#cp-app-drive-tree-search-input')[0].selectionStart = getSearchCursor();