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

fix(composer-emoji): Only show replacement PNGs for OS X

Browse source
This commit is contained in:
Jackie Luo 2016-03-25 13:35:32 -07:00
parent 5c0b88d258
commit 457e068188
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal_packages/composer-emoji/lib/emoji-button-popover.jsx
View file

@ -269,7 +269,7 @@ class EmojiButtonPopover extends React.Component {
ctx.fillStyle = 'black'; ctx.fillStyle = 'black';
if (this.state.categorizedEmoji[category].length === 0) return; if (this.state.categorizedEmoji[category].length === 0) return;
this.state.categorizedEmoji[category].forEach((emojiName, j) => { this.state.categorizedEmoji[category].forEach((emojiName, j) => {
if (missingEmojiList.indexOf(emojiName) === -1) { if (process.platform === "darwin" && missingEmojiList.indexOf(emojiName) === -1) {
const emojiChar = emoji.get(emojiName); const emojiChar = emoji.get(emojiName);
ctx.fillText(emojiChar, position.x, position.y); ctx.fillText(emojiChar, position.x, position.y);
} else { } else {

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

@ -205,7 +205,7 @@ class EmojiComposerExtension extends ComposerExtension {
} }
} }
const emojiChar = emoji.get(emojiName); const emojiChar = emoji.get(emojiName);
if (missingEmojiList.indexOf(emojiName) !== -1) { if (process.platform === "darwin" && missingEmojiList.indexOf(emojiName) !== -1) {
const html = `<span class="missing-emoji ${emojiName}"><img const html = `<span class="missing-emoji ${emojiName}"><img
src="images/composer-emoji/missing-emoji/${emojiName}.png" src="images/composer-emoji/missing-emoji/${emojiName}.png"
width="14" width="14"

2
internal_packages/composer-emoji/lib/emoji-picker.jsx
View file

@ -35,7 +35,7 @@ class EmojiPicker extends React.Component {
this.props.emojiOptions.forEach((emojiOption, i) => { this.props.emojiOptions.forEach((emojiOption, i) => {
const emojiClass = emojiIndex === i ? "btn btn-icon emoji-option" : "btn btn-icon"; const emojiClass = emojiIndex === i ? "btn btn-icon emoji-option" : "btn btn-icon";
let emojiChar = emoji.get(emojiOption); let emojiChar = emoji.get(emojiOption);
if (missingEmojiList.indexOf(emojiOption) !== -1) { if (process.platform === "darwin" && missingEmojiList.indexOf(emojiOption) !== -1) {
emojiChar = (<img emojiChar = (<img
src={`images/composer-emoji/missing-emoji/${emojiOption}.png`} src={`images/composer-emoji/missing-emoji/${emojiOption}.png`}
width="16" width="16"