Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-01-19 14:40:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(composer-emoji): Return null if no matching node is found

Browse source
This commit is contained in:
Jackie Luo 2016-03-23 17:01:14 -07:00
parent a8e5d9948e
commit be9c616840
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal_packages/composer-emoji/lib/emoji-composer-extension.jsx
View file

@ -80,8 +80,9 @@ class EmojiComposerExtension extends ContenteditableExtension {
if (event.key === "ArrowDown" || event.key === "ArrowRight" ||
event.key === "ArrowUp" || event.key === "ArrowLeft") {
event.preventDefault();
const moveToNext = (event.key === "ArrowDown" || event.key === "ArrowRight")
const moveToNext = (event.key === "ArrowDown" || event.key === "ArrowRight");
const emojiNameNode = DOMUtils.closest(sel.anchorNode, "n1-emoji-autocomplete");
if (!emojiNameNode) return null;
const selectedEmoji = emojiNameNode.getAttribute("selectedEmoji");
if (selectedEmoji) {
const emojiIndex = emojiOptions.indexOf(selectedEmoji);
@ -100,6 +101,7 @@ class EmojiComposerExtension extends ContenteditableExtension {
} else if (event.key === "Enter" || event.key === "Tab") {
event.preventDefault();
const emojiNameNode = DOMUtils.closest(sel.anchorNode, "n1-emoji-autocomplete");
if (!emojiNameNode) return null;
let selectedEmoji = emojiNameNode.getAttribute("selectedEmoji");
if (!selectedEmoji) selectedEmoji = emojiOptions[0];
EmojiComposerExtension._onSelectEmoji({editor: editor,