Merge pull request #10146 from Piccirello/webui-escape-key

Add Web UI support for escape key
This commit is contained in:
Mike Tzou
2019-01-22 11:30:50 +08:00
committed by GitHub
11 changed files with 120 additions and 42 deletions

View File

@@ -11,16 +11,23 @@
<script>
'use strict';
var newCategoryKeyboardEvents = new Keyboard({
new Keyboard({
defaultEventType: 'keydown',
events: {
'enter': function(event) {
'Enter': function(event) {
$('categoryNameButton').click();
event.preventDefault();
},
'Escape': function(event) {
window.parent.closeWindows();
event.preventDefault();
},
'Esc': function(event) {
window.parent.closeWindows();
event.preventDefault();
}
}
});
newCategoryKeyboardEvents.activate();
}).activate();
window.addEvent('domready', function() {
var uriAction = safeTrim(new URI().getData('action'));
@@ -28,10 +35,7 @@
var uriCategoryName = safeTrim(new URI().getData('categoryName'));
var uriSavePath = safeTrim(new URI().getData('savePath'));
if (uriAction === "create") {
$('categoryName').focus();
}
else if (uriAction === "edit") {
if (uriAction === "edit") {
if (!uriCategoryName)
return false;
@@ -40,6 +44,9 @@
$('savePath').set('value', escapeHtml(uriSavePath));
$('savePath').focus();
}
else {
$('categoryName').focus();
}
$('categoryNameButton').addEvent('click', function(e) {
new Event(e).stop();