Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: Keyboard shortcut to refocus composer (#5506) 

It was very annoying to get back to the composer after losing it!

Added to the keyboard shortcuts help dialog, and reshuffled it a bit.
Translation keys were intentionally kept so our translators don't have
to copy paste to update.

This commit also fixes an incidental listener leak.
This commit is contained in:
Kane York 2018-01-16 22:15:03 -08:00 committed by Sam
parent 604c189440
commit ff91c43087
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/components/d-editor.js.es6
View File

@ -254,6 +254,7 @@ export default Ember.Component.extend({
@on('willDestroyElement')
_shutDown() {
if (this.get('composerEvents')) {
this.appEvents.off('composer:insert-block');
this.appEvents.off('composer:insert-text');
this.appEvents.off('composer:replace-text');
}

10
app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
View File

@ -12,6 +12,7 @@ const bindings = {
'.': {click: '.alert.alert-info.clickable', anonymous: true}, // show incoming/updated topics
'b': {handler: 'toggleBookmark'},
'c': {handler: 'createTopic'},
'C': {handler: 'focusComposer'},
'ctrl+f': {handler: 'showPageSearch', anonymous: true},
'command+f': {handler: 'showPageSearch', anonymous: true},
'ctrl+p': {handler: 'printTopic', anonymous: true},
@ -174,6 +175,15 @@ export default {
}
},
focusComposer() {
const composer = this.container.lookup('controller:composer');
if (composer.get('model.viewOpen')) {
setTimeout(() => $('textarea.d-editor-input').focus(), 0);
} else {
composer.send('openIfDraft');
}
},
pinUnpinTopic() {
this.container.lookup('controller:topic').togglePinnedState();
},

14
app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
View File

@ -25,7 +25,6 @@
<div class="span6">
<h4>{{i18n 'keyboard_shortcuts_help.application.title'}}</h4>
<ul>
<li>{{{i18n 'keyboard_shortcuts_help.application.create'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.application.hamburger_menu'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.application.user_profile_menu'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.application.show_incoming_updated_topics'}}}</li>
@ -35,6 +34,15 @@
<li>{{{i18n 'keyboard_shortcuts_help.application.dismiss_topics'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.application.log_out'}}}</li>
</ul>
<h4>{{i18n 'keyboard_shortcuts_help.composing.title'}}</h4>
<ul>
<li>{{{i18n 'keyboard_shortcuts_help.composing.return'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.application.create'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.actions.reply_as_new_topic'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.actions.reply_topic'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.actions.reply_post'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.actions.quote_post'}}}</li>
</ul>
</div>
<div class="span6">
<h4>{{i18n 'keyboard_shortcuts_help.actions.title'}}</h4>
@ -43,10 +51,6 @@
<li>{{{i18n 'keyboard_shortcuts_help.actions.pin_unpin_topic'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.actions.share_topic'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.actions.share_post'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.actions.reply_as_new_topic'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.actions.reply_topic'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.actions.reply_post'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.actions.quote_post'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.actions.like'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.actions.flag'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.actions.bookmark'}}}</li>

3
config/locales/client.en.yml
View File

@ -2442,6 +2442,9 @@ en:
dismiss_new_posts: '<b>x</b>, <b>r</b> Dismiss New/Posts'
dismiss_topics: '<b>x</b>, <b>t</b> Dismiss Topics'
log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Log Out'
composing:
title: 'Composing'
return: '<b>shift</b>+<b>C</b> Return to composer'
actions:
title: 'Actions'
bookmark_topic: '<b>f</b> Toggle bookmark topic'