Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-23 15:46:28 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(emoji): Stop checking text outside of current div for matches

Browse source
This commit is contained in:
Jackie Luo 2016-06-09 16:50:49 -07:00
parent ee86aa0ccd
commit 5a9ac9b79f
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -247,9 +247,12 @@ class EmojiComposerExtension extends ComposerExtension {
prevTextNode.nodeValue.indexOf(":") === -1) {
text = prevTextNode.nodeValue + text;
prevTextNode = DOMUtils.previousTextNode(prevTextNode);
} else {
} else if (prevTextNode.nextSibling &&
prevTextNode.nextSibling.nodeName !== "DIV") {
text = prevTextNode.nodeValue.trim() + text;
break;
} else {
break;
}
}
return {text: text, textNode: prevTextNode};

2
src/pro

@ -1 +1 @@
Subproject commit d302ff12a2ded168d03f594d30ebfd9067320f12
Subproject commit 75d429ceed1c35a09faaadda235157167fc1eeb6