Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix previous hotkey fix 

re-enable 'j' and 'k' hotkeys.

(imported from commit 61a9025c4b0560f9f6ce4e9699e191c40106fcde)
This commit is contained in:
acrefoot 2013-06-10 14:52:45 -04:00
parent 05d2fca93b
commit b3be518b5a
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zephyr/static/js/hotkey.js
View File

@ -3,21 +3,21 @@ var hotkeys = (function () {
var exports = {};
var directional_hotkeys = {
40: {getrow: rows.next_visible, direction: 1}, // down arrow
106: {getrow: rows.next_visible, direction: 1}, // 'j'
38: {getrow: rows.prev_visible, direction: -1}, // up arrow
107: {getrow: rows.prev_visible, direction: -1}, // 'k'
36: {getrow: rows.first_visible, direction: -1} // Home
40: {getrow: rows.next_visible, direction: 1, charCode: 0}, // down arrow
106: {getrow: rows.next_visible, direction: 1, charCode: 106}, // 'j'
38: {getrow: rows.prev_visible, direction: -1, charCode: 0}, // up arrow
107: {getrow: rows.prev_visible, direction: -1, charCode: 107}, // 'k'
36: {getrow: rows.first_visible, direction: -1, charCode: 0} // Home
};
var arrow_keys = {
40: {getrow: rows.next_visible, direction: 1}, // down arrow
38: {getrow: rows.prev_visible, direction: -1} // up arrow
40: {getrow: rows.next_visible, direction: 1, charCode: 0}, // down arrow
38: {getrow: rows.prev_visible, direction: -1, charCode: 0} // up arrow
};
var directional_hotkeys_id = {
35: {getid: function () {return current_msg_list.last().id;},
direction: 1} // End
direction: 1, charCode: 0} // End
};
var narrow_hotkeys = {
@ -92,7 +92,7 @@ function process_hotkey(e) {
}
if (arrow_keys.hasOwnProperty(code)
&& charCode === 0
&& charCode === arrow_keys[code].charCode
&& compose.composing()
&& compose.message_content() === "") {
compose.cancel();
@ -115,7 +115,8 @@ function process_hotkey(e) {
return false;
}
if (directional_hotkeys_id.hasOwnProperty(code) && charCode === 0) {
if (directional_hotkeys_id.hasOwnProperty(code)
&& directional_hotkeys_id.hasOwnProperty[code].charCode === charCode) {
if (current_msg_list.empty()) {
return false;
}
@ -127,7 +128,8 @@ function process_hotkey(e) {
return true;
}
if (directional_hotkeys.hasOwnProperty(code) && charCode === 0) {
if (directional_hotkeys.hasOwnProperty(code)
&& directional_hotkeys[code].charCode === charCode) {
if (current_msg_list.empty()) {
return false;
}