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

Code Simplification and Emoji Drag Fix. 

There’s no need for four separate `$(sel).is()` statements, one will
do. This also added .drag to the list to ignore.
This commit is contained in:
Brock Whittaker 2016-11-16 15:04:30 -08:00 committed by Tim Abbott
parent 2663215625
commit 5d2b81358c
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
static/js/click_handlers.js
View File

@ -288,10 +288,7 @@ $(function () {
function handle_compose_click(e) { function handle_compose_click(e) {
// Emoji clicks should be handled by their own click handler in popover.js // Emoji clicks should be handled by their own click handler in popover.js
if ($(e.target).is("#emoji_map") || if ($(e.target).is("#emoji_map, .emoji_popover, .emoji_popover.inner, img.emoji, .drag")) {
$(e.target).is(".emoji_popover") ||
$(e.target).is(".emoji_popover.inner") ||
$(e.target).is("img.emoji")) {
return; return;
} }
// Don't let clicks in the compose area count as // Don't let clicks in the compose area count as