Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge upstream (#81)

Browse source
This commit is contained in:
kibigo! 2017-07-15 14:33:15 -07:00
commit 09cfc079b0
213 changed files with 2714 additions and 1364 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/mastodon/features/compose/components/compose_form.js
View file

@ -140,7 +140,8 @@ export default class ComposeForm extends ImmutablePureComponent {
handleEmojiPick = (data) => {
const position = this.autosuggestTextarea.textarea.selectionStart;
this._restoreCaret = position + data.shortname.length + 1;
const emojiChar = String.fromCodePoint(parseInt(data.unicode, 16));
this._restoreCaret = position + emojiChar.length + 1;
this.props.onPickEmoji(position, data);
}