mirror of
https://github.com/wekan/wekan.git
synced 2026-02-16 13:08:07 +01:00
Implement a new system to handle "escape actions"
The new EscapeActions object decide what to do when the user press the Escape key (such as closing a opened popup or inlined form). This commit also re-introduced the sidebar current view as a sidebar component local state.
This commit is contained in:
parent
1b4fcc67f4
commit
40c2411f2a
13 changed files with 148 additions and 53 deletions
|
|
@ -1,5 +1,9 @@
|
|||
Template.editor.rendered = function() {
|
||||
this.$('textarea').textcomplete([
|
||||
var dropdownMenuIsOpened = false;
|
||||
|
||||
Template.editor.onRendered(function() {
|
||||
var $textarea = this.$('textarea');
|
||||
|
||||
$textarea.textcomplete([
|
||||
// Emojies
|
||||
{
|
||||
match: /\B:([\-+\w]*)$/,
|
||||
|
|
@ -37,4 +41,26 @@ Template.editor.rendered = function() {
|
|||
index: 1
|
||||
}
|
||||
]);
|
||||
};
|
||||
|
||||
// Since commit d474017 jquery-textComplete automatically closes a potential
|
||||
// opened dropdown menu when the user press Escape. This behavior conflicts
|
||||
// with our EscapeActions system, but it's too complicated and hacky to
|
||||
// monkey-pach textComplete to disable it -- I tried. Instead we listen to
|
||||
// 'open' and 'hide' events, and create a ghost escapeAction when the dropdown
|
||||
// is opened (and rely on textComplete to execute the actual action).
|
||||
$textarea.on({
|
||||
'textComplete:show': function() {
|
||||
dropdownMenuIsOpened = true;
|
||||
},
|
||||
'textComplete:hide': function() {
|
||||
Tracker.afterFlush(function() {
|
||||
dropdownMenuIsOpened = false;
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
EscapeActions.register(10,
|
||||
function() { return dropdownMenuIsOpened; },
|
||||
function() {}
|
||||
);
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
Template.editor.events({
|
||||
// Pressing Ctrl+Enter should submit the form.
|
||||
'keydown textarea': function(event) {
|
||||
if (event.keyCode === 13 && (event.metaKey || event.ctrlKey)) {
|
||||
$(event.currentTarget).parents('form:first').submit();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
</template>
|
||||
|
||||
<template name="editor">
|
||||
<textarea class="{{class}}" placeholder="{{_ 'comment-placeholder'}}" id="{{id}}" tabindex="1">{{> UI.contentBlock }}</textarea>
|
||||
<textarea class="{{class}}" placeholder="{{_ 'comment-placeholder'}}" id="{{id}}" autofocus="{{autofocus}}">{{> UI.contentBlock}}</textarea>
|
||||
</template>
|
||||
|
||||
<template name="viewer">{{#markdown}}{{#emoji}}{{#mentions}}{{> UI.contentBlock }}{{/mentions}}{{/emoji}}{{/markdown}}</template>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue