Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-22 08:16:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(composer-emoji): Replace images with Unicode characters properly

Browse source
This commit is contained in:
Jackie Luo 2016-04-04 11:03:52 -07:00
parent 4a1c068c29
commit 3cf2570561
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -133,7 +133,7 @@ class EmojiComposerExtension extends ComposerExtension {
static applyTransformsToDraft = ({draft}) => { static applyTransformsToDraft = ({draft}) => {
const nextDraft = draft.clone(); const nextDraft = draft.clone();
nextDraft.body = nextDraft.body.replace(/<span class="missing-emoji ([a-zA-Z0-9-_]*)">.*<\/span>/g, (match, emojiName) => nextDraft.body = nextDraft.body.replace(/<img class="missing-emoji ([a-zA-Z0-9-_]*)" [^<]+>/g, (match, emojiName) =>
`<span class="broken-emoji ${emojiName}">${emoji.get(emojiName)}</span>` `<span class="broken-emoji ${emojiName}">${emoji.get(emojiName)}</span>`
); );
return nextDraft; return nextDraft;
@ -141,8 +141,8 @@ class EmojiComposerExtension extends ComposerExtension {
static unapplyTransformsToDraft = ({draft}) => { static unapplyTransformsToDraft = ({draft}) => {
const nextDraft = draft.clone(); const nextDraft = draft.clone();
nextDraft.body = nextDraft.body.replace(/<span class="broken-emoji ([a-zA-Z0-9-_]*)">.*<\/span>/g, (match, emojiName) => nextDraft.body = nextDraft.body.replace(/<span class="broken-emoji ([a-zA-Z0-9-_]*)">[^<]+<\/span>/g, (match, emojiName) =>
`<span class="missing-emoji ${emojiName}"><img src="images/composer-emoji/missing-emoji/${emojiName}.png" width="14" height="14" style="margin-top: -5px;" /></span>` `<img class="missing-emoji ${emojiName}" src="images/composer-emoji/missing-emoji/${emojiName}.png" width="14" height="14" style="margin-top: -5px;">`
); );
return nextDraft; return nextDraft;
} }
@ -206,11 +206,12 @@ class EmojiComposerExtension extends ComposerExtension {
} }
const emojiChar = emoji.get(emojiName); const emojiChar = emoji.get(emojiName);
if (process.platform === "darwin" && missingEmojiList.indexOf(emojiName) !== -1) { if (process.platform === "darwin" && missingEmojiList.indexOf(emojiName) !== -1) {
const html = `<span class="missing-emoji ${emojiName}"><img const html = `<img
class="missing-emoji ${emojiName}"
src="images/composer-emoji/missing-emoji/${emojiName}.png" src="images/composer-emoji/missing-emoji/${emojiName}.png"
width="14" width="14"
height="14" height="14"
style="margin-top: -5px;" /></span>`; style="margin-top: -5px;">`;
editor.insertHTML(html, {selectInsertion: false}); editor.insertHTML(html, {selectInsertion: false});
} else { } else {
editor.insertText(emojiChar); editor.insertText(emojiChar);