CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-09 21:21:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Separate hotkeys that require messages from those that don't.

Browse Source 
Fixes the blueslip error on "i" in empty narrow.

Also removes a then-uncessary check from do_narrow_action as suggested
by acrefoot.

(imported from commit 10b1f702b535b4eef54e500ccef93b6a5280e953)
This commit is contained in:
Kevin Mehall 2013-08-07 18:03:28 -04:00
parent 2664002dec
commit 5f48eebc8a
1 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
static/js/hotkey.js
View File

@ -3,9 +3,6 @@ var hotkeys = (function () {
var exports = {};
function do_narrow_action(action) {
if (current_msg_list.empty()) {
return false;
}
action(current_msg_list.selected_id(), {trigger: 'hotkey'});
return true;
}
@ -207,62 +204,40 @@ function process_hotkey(e) {
return false;
}
// Shortcuts that don't require a message
switch (event_name) {
case 'message_actions':
var id = current_msg_list.selected_id();
popovers.show_actions_popover($(".selected_message .actions_hover")[0], id);
return true;
case 'narrow_by_recipient':
return do_narrow_action(narrow.by_recipient);
case 'narrow_by_subject':
return do_narrow_action(narrow.by_subject);
case 'narrow_private':
return do_narrow_action(function (target, opts) {
narrow.by('is', 'private', opts);
});
}
switch (event_name) {
case 'escape': // Esc: close actions popup, cancel compose, clear a find, or un-narrow
if (popovers.any_active()) {
popovers.hide_all();
} else if (compose.composing()) {
compose.cancel();
} else {
search.clear_search();
}
return true;
case 'compose': // 'c': compose
compose.start('stream');
return true;
case 'compose_private_message':
compose.start('private');
return true;
case 'enter': // Enter: respond to message (unless we need to do something else)
respond_to_cursor = true;
respond_to_message({trigger: 'hotkey enter'});
return true;
case 'reply_message': // 'r': respond to message
respond_to_cursor = true;
respond_to_message({trigger: 'hotkey'});
return true;
case 'respond_to_author': // 'R': respond to author
respond_to_message({reply_type: "personal", trigger: 'hotkey pm'});
return true;
case 'search':
search.initiate_search();
return true;
case 'show_shortcuts': // Show keyboard shortcuts page
$('#keyboard-shortcuts').modal('show');
return true;
case 'narrow_private':
return do_narrow_action(function (target, opts) {
narrow.by('is', 'private', opts);
});
case 'escape': // Esc: close actions popup, cancel compose, clear a find, or un-narrow
if (popovers.any_active()) {
popovers.hide_all();
} else if (compose.composing()) {
compose.cancel();
} else {
search.clear_search();
}
return true;
case 'compose': // 'c': compose
compose.start('stream');
return true;
case 'compose_private_message':
compose.start('private');
return true;
case 'search':
search.initiate_search();
return true;
case 'show_shortcuts': // Show keyboard shortcuts page
$('#keyboard-shortcuts').modal('show');
return true;
}
if (current_msg_list.empty()) {
return false;
}
// Navigation shortcuts
switch (event_name) {
case 'down_arrow':
case 'vim_down':
@ -286,6 +261,29 @@ function process_hotkey(e) {
return true;
}
// Shortcuts that operate on a message
switch (event_name) {
case 'message_actions':
var id = current_msg_list.selected_id();
popovers.show_actions_popover($(".selected_message .actions_hover")[0], id);
return true;
case 'narrow_by_recipient':
return do_narrow_action(narrow.by_recipient);
case 'narrow_by_subject':
return do_narrow_action(narrow.by_subject);
case 'enter': // Enter: respond to message (unless we need to do something else)
respond_to_cursor = true;
respond_to_message({trigger: 'hotkey enter'});
return true;
case 'reply_message': // 'r': respond to message
respond_to_cursor = true;
respond_to_message({trigger: 'hotkey'});
return true;
case 'respond_to_author': // 'R': respond to author
respond_to_message({reply_type: "personal", trigger: 'hotkey pm'});
return true;
}
return false;
}