mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Simplify closing emoji panel on escape key down

Browse source
This commit is contained in:
Daniel Gasienica 2018-05-08 17:30:11 -04:00
parent 48708d5738
commit e723484498
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
js/views/conversation_view.js
View file

@ -223,7 +223,7 @@
}, },
events: { events: {
'keydown': 'escapeEmojiPanel', keydown: 'onKeyDown',
'submit .send': 'checkUnverifiedSendMessage', 'submit .send': 'checkUnverifiedSendMessage',
'input .send-message': 'updateMessageFieldSize', 'input .send-message': 'updateMessageFieldSize',
'keydown .send-message': 'updateMessageFieldSize', 'keydown .send-message': 'updateMessageFieldSize',
@ -1202,12 +1202,12 @@
this.closeEmojiPanel(); this.closeEmojiPanel();
} }
}, },
escapeEmojiPanel(e){ onKeyDown(event) {
// Close emoji panel on escape key press if (event.key !== 'Escape') {
const keyCode = e.keyCode || e.which; return;
if (keyCode == 27 && this.emojiPanel != null) {
this.closeEmojiPanel();
} }
this.closeEmojiPanel();
}, },
openEmojiPanel() { openEmojiPanel() {
this.$emojiPanelContainer.outerHeight(200); this.$emojiPanelContainer.outerHeight(200);
@ -1217,6 +1217,10 @@
this.updateMessageFieldSize({}); this.updateMessageFieldSize({});
}, },
closeEmojiPanel() { closeEmojiPanel() {
if (this.emojiPanel === null) {
return;
}
this.$emojiPanelContainer.empty().outerHeight(0); this.$emojiPanelContainer.empty().outerHeight(0);
this.emojiPanel = null; this.emojiPanel = null;
this.updateMessageFieldSize({}); this.updateMessageFieldSize({});