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

hotkey: Add 'delete' to delete focused draft.

Browse Source
This commit is contained in:
Shubham Dhama
2018-03-08 01:57:55 +05:30
committed by Tim Abbott
parent f3413d3b59
commit 3b92f6115a
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend_tests/node_tests/hotkey.js
View File

@@ -91,6 +91,7 @@ function stubbing(func_name_to_stub, test_function) {
assert.equal(map_down(27).name, 'escape'); assert.equal(map_down(27).name, 'escape');
assert.equal(map_down(37).name, 'left_arrow'); assert.equal(map_down(37).name, 'left_arrow');
assert.equal(map_down(13).name, 'enter'); assert.equal(map_down(13).name, 'enter');
assert.equal(map_down(46).name, 'delete');
assert.equal(map_down(13, true).name, 'enter'); assert.equal(map_down(13, true).name, 'enter');
assert.equal(map_press(47).name, 'search'); // slash assert.equal(map_press(47).name, 'search'); // slash

2
static/js/drafts.js
View File

@@ -365,7 +365,7 @@ exports.drafts_handle_events = function (e, event_key) {
var elt = document.activeElement; var elt = document.activeElement;
var focused_draft = $(elt.parentElement)[0].getAttribute("data-draft-id"); var focused_draft = $(elt.parentElement)[0].getAttribute("data-draft-id");
// Allows user to delete drafts with backspace // Allows user to delete drafts with backspace
if (event_key === "backspace") { if (event_key === "backspace" || event_key === "delete") {
if (elt.parentElement.hasAttribute("data-draft-id")) { if (elt.parentElement.hasAttribute("data-draft-id")) {
var focus_draft_back_row = $(elt)[0].parentElement; var focus_draft_back_row = $(elt)[0].parentElement;
var backnext_focus_draft_row = $(focus_draft_back_row).next(); var backnext_focus_draft_row = $(focus_draft_back_row).next();

2
static/js/hotkey.js
View File

@@ -65,6 +65,7 @@ var keydown_either_mappings = {
// in other apps, but that's also slightly dubious. // in other apps, but that's also slightly dubious.
8: {name: 'backspace', message_view_only: true}, // backspace 8: {name: 'backspace', message_view_only: true}, // backspace
13: {name: 'enter', message_view_only: false}, // enter 13: {name: 'enter', message_view_only: false}, // enter
46: {name: 'delete', message_view_only: false}, // delete
}; };
var keypress_mappings = { var keypress_mappings = {
@@ -436,6 +437,7 @@ exports.process_hotkey = function (e, hotkey) {
case 'up_arrow': case 'up_arrow':
case 'down_arrow': case 'down_arrow':
case 'backspace': case 'backspace':
case 'delete':
if (overlays.drafts_open()) { if (overlays.drafts_open()) {
drafts.drafts_handle_events(e, event_name); drafts.drafts_handle_events(e, event_name);
return true; return true;