Fixed unicode emoji not having a consistent size
Этот коммит содержится в:
@@ -5,7 +5,6 @@ import ReactDOM from 'react-dom';
|
|||||||
import FileAttachmentList from './file_attachment_list.jsx';
|
import FileAttachmentList from './file_attachment_list.jsx';
|
||||||
import UserStore from 'stores/user_store.jsx';
|
import UserStore from 'stores/user_store.jsx';
|
||||||
import * as Utils from 'utils/utils.jsx';
|
import * as Utils from 'utils/utils.jsx';
|
||||||
import * as Emoji from 'utils/emoticons.jsx';
|
|
||||||
import Constants from 'utils/constants.jsx';
|
import Constants from 'utils/constants.jsx';
|
||||||
import * as TextFormatting from 'utils/text_formatting.jsx';
|
import * as TextFormatting from 'utils/text_formatting.jsx';
|
||||||
import twemoji from 'twemoji';
|
import twemoji from 'twemoji';
|
||||||
@@ -52,9 +51,9 @@ class PostBody extends React.Component {
|
|||||||
|
|
||||||
parseEmojis() {
|
parseEmojis() {
|
||||||
twemoji.parse(ReactDOM.findDOMNode(this), {
|
twemoji.parse(ReactDOM.findDOMNode(this), {
|
||||||
className: 'emoji twemoji',
|
className: 'emoticon',
|
||||||
base: '',
|
base: '',
|
||||||
folder: Emoji.getImagePathForEmoticon()
|
folder: Constants.EMOJI_PATH
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -70,7 +70,11 @@ class RhsComment extends React.Component {
|
|||||||
this.forceUpdate();
|
this.forceUpdate();
|
||||||
}
|
}
|
||||||
parseEmojis() {
|
parseEmojis() {
|
||||||
twemoji.parse(ReactDOM.findDOMNode(this), {size: Constants.EMOJI_SIZE});
|
twemoji.parse(ReactDOM.findDOMNode(this), {
|
||||||
|
className: 'emoticon',
|
||||||
|
base: '',
|
||||||
|
folder: Constants.EMOJI_PATH
|
||||||
|
});
|
||||||
}
|
}
|
||||||
handlePermalink(e) {
|
handlePermalink(e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import UserProfile from './user_profile.jsx';
|
|||||||
import UserStore from 'stores/user_store.jsx';
|
import UserStore from 'stores/user_store.jsx';
|
||||||
import * as TextFormatting from 'utils/text_formatting.jsx';
|
import * as TextFormatting from 'utils/text_formatting.jsx';
|
||||||
import * as Utils from 'utils/utils.jsx';
|
import * as Utils from 'utils/utils.jsx';
|
||||||
import * as Emoji from 'utils/emoticons.jsx';
|
|
||||||
import FileAttachmentList from './file_attachment_list.jsx';
|
import FileAttachmentList from './file_attachment_list.jsx';
|
||||||
import twemoji from 'twemoji';
|
import twemoji from 'twemoji';
|
||||||
import PostBodyAdditionalContent from './post_body_additional_content.jsx';
|
import PostBodyAdditionalContent from './post_body_additional_content.jsx';
|
||||||
@@ -30,9 +29,9 @@ export default class RhsRootPost extends React.Component {
|
|||||||
}
|
}
|
||||||
parseEmojis() {
|
parseEmojis() {
|
||||||
twemoji.parse(ReactDOM.findDOMNode(this), {
|
twemoji.parse(ReactDOM.findDOMNode(this), {
|
||||||
className: 'emoji twemoji',
|
className: 'emoticon',
|
||||||
base: '',
|
base: '',
|
||||||
folder: Emoji.getImagePathForEmoticon()
|
folder: Constants.EMOJI_PATH
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
handlePermalink(e) {
|
handlePermalink(e) {
|
||||||
|
|||||||
@@ -605,5 +605,6 @@ export default {
|
|||||||
MIN_PASSWORD_LENGTH: 5,
|
MIN_PASSWORD_LENGTH: 5,
|
||||||
MAX_PASSWORD_LENGTH: 50,
|
MAX_PASSWORD_LENGTH: 50,
|
||||||
TIME_SINCE_UPDATE_INTERVAL: 30000,
|
TIME_SINCE_UPDATE_INTERVAL: 30000,
|
||||||
MIN_HASHTAG_LINK_LENGTH: 3
|
MIN_HASHTAG_LINK_LENGTH: 3,
|
||||||
|
EMOJI_PATH: '/static/emoji'
|
||||||
};
|
};
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user