github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-01 02:43:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cpradio/keyboard-binding-incoming-updated-topics'

Browse Source 
Conflicts:
	config/locales/client.en.yml
This commit is contained in:
cpradio 2014-08-29 19:53:54 -04:00
commit d2dea54c88
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/lib/keyboard_shortcuts.js
View File

@ -36,6 +36,7 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({
'm r': 'div.notification-options li[data-id="1"] a', // mark topic as regular 'm r': 'div.notification-options li[data-id="1"] a', // mark topic as regular
'm t': 'div.notification-options li[data-id="2"] a', // mark topic as tracking 'm t': 'div.notification-options li[data-id="2"] a', // mark topic as tracking
'm w': 'div.notification-options li[data-id="3"] a', // mark topic as watching 'm w': 'div.notification-options li[data-id="3"] a', // mark topic as watching
'.': '.alert.alert-info.clickable', // show incoming/updated topics
'n': '#user-notifications', // open notifications menu 'n': '#user-notifications', // open notifications menu
'o,enter': '.topic-list tr.selected a.title', // open selected topic 'o,enter': '.topic-list tr.selected a.title', // open selected topic
'shift+r': '#topic-footer-buttons button.create', // reply to topic 'shift+r': '#topic-footer-buttons button.create', // reply to topic

1
app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.js.handlebars
View File

@ -26,6 +26,7 @@
<li>{{{i18n keyboard_shortcuts_help.application.notifications}}}</li> <li>{{{i18n keyboard_shortcuts_help.application.notifications}}}</li>
<li>{{{i18n keyboard_shortcuts_help.application.site_map_menu}}}</li> <li>{{{i18n keyboard_shortcuts_help.application.site_map_menu}}}</li>
<li>{{{i18n keyboard_shortcuts_help.application.user_profile_menu}}}</li> <li>{{{i18n keyboard_shortcuts_help.application.user_profile_menu}}}</li>
<li>{{{i18n keyboard_shortcuts_help.application.show_incoming_updated_topics}}}</li>
<li>{{{i18n keyboard_shortcuts_help.application.search}}}</li> <li>{{{i18n keyboard_shortcuts_help.application.search}}}</li>
<li>{{{i18n keyboard_shortcuts_help.application.show_incoming_updated}}}</li> <li>{{{i18n keyboard_shortcuts_help.application.show_incoming_updated}}}</li>
<li>{{{i18n keyboard_shortcuts_help.application.help}}}</li> <li>{{{i18n keyboard_shortcuts_help.application.help}}}</li>

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

@ -2056,7 +2056,7 @@ en:
notifications: '<b>n</b> Open notifications' notifications: '<b>n</b> Open notifications'
site_map_menu: '<b>=</b> Open site map menu' site_map_menu: '<b>=</b> Open site map menu'
user_profile_menu: '<b>p</b> Open user profile menu' user_profile_menu: '<b>p</b> Open user profile menu'
show_incoming_updated: '<b>.</b> Show incoming/updated topics' show_incoming_updated_topics: '<b>.</b> Show incoming/updated topics'
search: '<b>/</b> Search' search: '<b>/</b> Search'
help: '<b>?</b> Open keyboard shortcuts help' help: '<b>?</b> Open keyboard shortcuts help'
dismiss_new_posts: '<b>x</b>, <b>r</b> Dismiss New/Posts' dismiss_new_posts: '<b>x</b>, <b>r</b> Dismiss New/Posts'

1
test/javascripts/components/keyboard-shortcuts-test.js.es6
View File

@ -49,6 +49,7 @@ module("Discourse.KeyboardShortcuts", {
" <button id='dismiss-new-top'></button>", " <button id='dismiss-new-top'></button>",
" <button id='dismiss-topics-top'></button>", " <button id='dismiss-topics-top'></button>",
"</div>", "</div>",
"<div class='alert alert-info clickable'></div>",
"<button id='create-topic'></button>", "<button id='create-topic'></button>",
"<div id='user-notifications'></div>", "<div id='user-notifications'></div>",
"<div id='site-map'></div>", "<div id='site-map'></div>",