paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-19 05:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add maybe_show_keyboard_shortcuts().

Browse Source 
This prevents some strange UI experiences and some blueslip
errors by not opening keyboard help when other overlays or
popovers are open.
This commit is contained in:
Steve Howell
2017-06-15 10:11:17 -04:00
parent 1d47a7b505
commit d2b710b307
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/hotkey.js
View File

@@ -200,7 +200,7 @@ function stubbing(func_name_to_stub, test_function) {
assert_mapping('n', 'subs.new_stream_clicked'); assert_mapping('n', 'subs.new_stream_clicked');
overlays.streams_open = return_false; overlays.streams_open = return_false;
assert_mapping('?', 'ui.show_info_overlay'); assert_mapping('?', 'ui.maybe_show_keyboard_shortcuts');
assert_mapping('/', 'search.initiate_search'); assert_mapping('/', 'search.initiate_search');
assert_mapping('q', 'activity.initiate_search'); assert_mapping('q', 'activity.initiate_search');
assert_mapping('w', 'stream_list.initiate_search'); assert_mapping('w', 'stream_list.initiate_search');

2
static/js/hotkey.js
View File

@@ -564,7 +564,7 @@ exports.process_hotkey = function (e, hotkey) {
gear_menu.open(); gear_menu.open();
return true; return true;
case 'show_shortcuts': // Show keyboard shortcuts page case 'show_shortcuts': // Show keyboard shortcuts page
ui.show_info_overlay("keyboard-shortcuts"); ui.maybe_show_keyboard_shortcuts();
return true; return true;
case 'stream_cycle_backward': case 'stream_cycle_backward':
navigate.cycle_stream('backward'); navigate.cycle_stream('backward');

10
static/js/ui.js
View File

@@ -156,6 +156,16 @@ exports.show_info_overlay = function (target) {
} }
}; };
exports.maybe_show_keyboard_shortcuts = function () {
if (overlays.is_active()) {
return;
}
if (popovers.any_active()) {
return;
}
ui.show_info_overlay("keyboard-shortcuts");
};
var loading_more_messages_indicator_showing = false; var loading_more_messages_indicator_showing = false;
exports.show_loading_more_messages_indicator = function () { exports.show_loading_more_messages_indicator = function () {
if (! loading_more_messages_indicator_showing) { if (! loading_more_messages_indicator_showing) {