Skip to content

Commit

Permalink
[FIX] Emoji as avatar (#12805)
Browse files Browse the repository at this point in the history
* Move emojiButton code from rocketchat:emoji to rocketchat:ui-message

* Export renderMessageBody via main module
  • Loading branch information
tassoevan authored and rodrigok committed Dec 5, 2018
1 parent abe1f41 commit b4db146
Show file tree
Hide file tree
Showing 11 changed files with 539 additions and 640 deletions.
608 changes: 257 additions & 351 deletions package-lock.json

Large diffs are not rendered by default.

40 changes: 0 additions & 40 deletions packages/rocketchat-emoji/client/emojiButton.js

This file was deleted.

1 change: 0 additions & 1 deletion packages/rocketchat-emoji/client/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import './emojiPicker.html';
import './emojiPicker';
import './lib/EmojiPicker';
import { renderEmoji } from './lib/emojiRenderer';
import './emojiButton';
import './keyboardFix';

export {
Expand Down
1 change: 0 additions & 1 deletion packages/rocketchat-emoji/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Package.onUse(function(api) {
'templating',
'rocketchat:lib',
'rocketchat:theme',
'rocketchat:ui-message',
'htmljs',
]);

Expand Down
Loading

0 comments on commit b4db146

Please sign in to comment.