loleaflet/dist/toolbar/toolbar.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit fab14708c89d471a236967cc10e37965efd0fe79
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Wed Feb 28 18:42:36 2018 +0530
loleaflet: Fix 'Find' ergonomics; don't make 2nd ctrl+f bring findbar
Change-Id: I82164555892324abf6eef2579bf1a99af510d10f
Reviewed-on: https://gerrit.libreoffice.org/50564
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index fc50d775a..cf8c1f82d 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -703,7 +703,7 @@ $(function () {
onRefresh: function(e) {
$('#tb_toolbar-down_item_userlist
.w2ui-tb-caption').addClass('loleaflet-font');
$('#search-input').off('input', onSearch).on('input',
onSearch);
- $('#search-input').off('keypress',
onSearchKeyPress).on('keypress', onSearchKeyPress);
+ $('#search-input').off('keydown',
onSearchKeyDown).on('keydown', onSearchKeyDown);
}
});
});
@@ -794,15 +794,15 @@ function onSearch(e) {
}
}
-function onSearchKeyPress(e) {
- if (e.keyCode === 13) { // Enter key
+function onSearchKeyDown(e) {
+ if ((e.keyCode === 71 && e.ctrlKey) || e.keyCode === 114 || e.keyCode
=== 13) {
if (e.shiftKey) {
- // search backwards
map.search(L.DomUtil.get('search-input').value, true);
} else {
map.search(L.DomUtil.get('search-input').value);
}
- } else if (e.keyCode === 27) { // Escape key
+ e.preventDefault();
+ } else if (e.keyCode === 27) {
_cancelSearch();
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
