paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

hotkeys: Add left/right arrow keys to toggle views in Streams menu.

Browse Source 
Fixes #4228
This commit is contained in:
Cynthia Lin
2017-03-22 22:02:01 -07:00
committed by Tim Abbott
parent fb89d8a2bf
commit b800cb05c0
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend_tests/node_tests/hotkey.js
View File

@@ -291,16 +291,15 @@ function stubbing(func_name_to_stub, test_function) {
assert_mapping('spacebar', 'navigate.page_down'); assert_mapping('spacebar', 'navigate.page_down');
assert_mapping('up_arrow', 'navigate.up'); assert_mapping('up_arrow', 'navigate.up');
hotkey.is_lightbox_open = return_true;
assert_mapping('left_arrow', 'lightbox.prev');
assert_mapping('right_arrow', 'lightbox.next');
hotkey.is_subs = return_true; hotkey.is_subs = return_true;
global.ui_state.home_tab_obscured = return_true; global.ui_state.home_tab_obscured = return_true;
assert_mapping('up_arrow', 'subs.switch_rows'); assert_mapping('up_arrow', 'subs.switch_rows');
assert_mapping('down_arrow', 'subs.switch_rows'); assert_mapping('down_arrow', 'subs.switch_rows');
global.ui_state.home_tab_obscured = return_false; global.ui_state.home_tab_obscured = return_false;
hotkey.is_subs = return_false;
hotkey.is_lightbox_open = return_true;
assert_mapping('left_arrow', 'lightbox.prev');
assert_mapping('right_arrow', 'lightbox.next');
hotkey.is_settings_page = return_true; hotkey.is_settings_page = return_true;
assert_unmapped('end'); assert_unmapped('end');

6
static/js/hotkey.js
View File

@@ -530,6 +530,9 @@ exports.process_hotkey = function (e, hotkey) {
if (exports.is_lightbox_open()) { if (exports.is_lightbox_open()) {
lightbox.prev(); lightbox.prev();
return true; return true;
} else if (exports.is_subs()) {
subs.toggle_view(event_name);
return true;
} }
message_edit.edit_last_sent_message(); message_edit.edit_last_sent_message();
@@ -540,6 +543,9 @@ exports.process_hotkey = function (e, hotkey) {
if (exports.is_lightbox_open()) { if (exports.is_lightbox_open()) {
lightbox.next(); lightbox.next();
return true; return true;
} else if (exports.is_subs()) {
subs.toggle_view(event_name);
return true;
} }
} }

12
static/js/subs.js
View File

@@ -761,6 +761,18 @@ exports.keyboard_sub = function () {
} }
}; };
exports.toggle_view = function (event) {
var active_data = get_active_data();
var hash;
if (event === 'right_arrow' && active_data[2].text() === 'Subscribed') {
hash = ['#streams', 'all'];
export_hash(hash);
} else if (event === 'left_arrow' && active_data[2].text() === 'All streams') {
hash = ['#streams', 'subscribed'];
export_hash(hash);
}
};
function ajaxSubscribe(stream) { function ajaxSubscribe(stream) {
// Subscribe yourself to a single stream. // Subscribe yourself to a single stream.
var true_stream_name; var true_stream_name;