summaryrefslogtreecommitdiffstats
path: root/client/components/main
diff options
context:
space:
mode:
authorMaxime Quandalle <maxime@quandalle.com>2015-05-26 20:30:01 +0200
committerMaxime Quandalle <maxime@quandalle.com>2015-05-26 20:34:56 +0200
commit40c2411f2a1ce0bbd177f377828f9d6700112b06 (patch)
treebf1f7ab8d94fe3e0edfcde817961d6954c11af4d /client/components/main
parent1b4fcc67f4ec94ed53a2f86ad6889e551f00815e (diff)
downloadwekan-40c2411f2a1ce0bbd177f377828f9d6700112b06.tar.gz
wekan-40c2411f2a1ce0bbd177f377828f9d6700112b06.tar.bz2
wekan-40c2411f2a1ce0bbd177f377828f9d6700112b06.zip
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.
Diffstat (limited to 'client/components/main')
-rw-r--r--client/components/main/editor.js (renamed from client/components/main/rendered.js)32
-rw-r--r--client/components/main/events.js8
-rw-r--r--client/components/main/templates.html2
3 files changed, 30 insertions, 12 deletions
diff --git a/client/components/main/rendered.js b/client/components/main/editor.js
index 787e8225..95a8dc5d 100644
--- a/client/components/main/rendered.js
+++ b/client/components/main/editor.js
@@ -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() {}
+);
diff --git a/client/components/main/events.js b/client/components/main/events.js
deleted file mode 100644
index beb90c5e..00000000
--- a/client/components/main/events.js
+++ /dev/null
@@ -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();
- }
- }
-});
diff --git a/client/components/main/templates.html b/client/components/main/templates.html
index e9be0f93..4828663a 100644
--- a/client/components/main/templates.html
+++ b/client/components/main/templates.html
@@ -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>