about summary refs log tree commit diff
path: root/app/javascript/core
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-08-02 17:22:08 +0200
committerThibG <thib@sitedethib.com>2018-08-05 12:57:20 +0200
commit5e6cec4a40417fabeae750e9ede7615c07e000a2 (patch)
tree948294ae52bdcab8c2f1d721476bcb90d346960b /app/javascript/core
parented6911704873de42b36f524d04a11caa00bb6ff8 (diff)
Import upstream's emojify function in settings.js
This fixes updating the profile preview when changing display name.
Diffstat (limited to 'app/javascript/core')
-rw-r--r--app/javascript/core/settings.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/core/settings.js b/app/javascript/core/settings.js
index 175a1758f..d727ca996 100644
--- a/app/javascript/core/settings.js
+++ b/app/javascript/core/settings.js
@@ -2,6 +2,7 @@
 
 const { length } = require('stringz');
 const { delegate } = require('rails-ujs');
+import emojify from '../mastodon/features/emoji/emoji';
 
 delegate(document, '#account_display_name', 'input', ({ target }) => {
   const nameCounter = document.querySelector('.name-counter');