about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features
diff options
context:
space:
mode:
authorkibigo! <marrus-sh@users.noreply.github.com>2018-01-04 21:17:30 -0800
committerkibigo! <marrus-sh@users.noreply.github.com>2018-01-04 21:17:30 -0800
commitd7ce339c2e33a5607c21d3eff316669cff9c6ea3 (patch)
tree01c4d0a820a52fad49708cb78ca3e71c78e234a5 /app/javascript/flavours/glitch/features
parent42f50049ff29ccdc484c22f8a5a19cda2dd03a5b (diff)
WIP <Compose> Refactor; Fin~
Diffstat (limited to 'app/javascript/flavours/glitch/features')
-rw-r--r--app/javascript/flavours/glitch/features/composer/textarea/index.js2
-rw-r--r--app/javascript/flavours/glitch/features/composer/textarea/suggestions/item/index.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/composer/textarea/index.js b/app/javascript/flavours/glitch/features/composer/textarea/index.js
index 1b6f79bba..955c06098 100644
--- a/app/javascript/flavours/glitch/features/composer/textarea/index.js
+++ b/app/javascript/flavours/glitch/features/composer/textarea/index.js
@@ -32,7 +32,7 @@ const handlers = {
 
   //  When blurring the textarea, suggestions are hidden.
   handleBlur () {
-    this.setState({ suggestionsHidden: true });
+    //this.setState({ suggestionsHidden: true });
   },
 
   //  When the contents of the textarea change, we have to pull up new
diff --git a/app/javascript/flavours/glitch/features/composer/textarea/suggestions/item/index.js b/app/javascript/flavours/glitch/features/composer/textarea/suggestions/item/index.js
index dc057e679..d2c794ae9 100644
--- a/app/javascript/flavours/glitch/features/composer/textarea/suggestions/item/index.js
+++ b/app/javascript/flavours/glitch/features/composer/textarea/suggestions/item/index.js
@@ -7,7 +7,7 @@ import React from 'react';
 import AccountContainer from 'flavours/glitch/containers/account_container';
 
 //  Utils.
-import { unicodeMapping } from 'flavours/glitch/util/emoji/emoji_unicode_mapping_light';
+import { unicodeMapping } from 'flavours/glitch/util/emoji';
 import { assignHandlers } from 'flavours/glitch/util/react_helpers';
 
 //  Gets our asset host from the environment, if available.