summaryrefslogtreecommitdiffstats
path: root/webapp/components/textbox.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-11-30 13:55:49 -0500
committerGitHub <noreply@github.com>2016-11-30 13:55:49 -0500
commit165ad0d4f791f8ae2109472d8a626d911fa368e0 (patch)
tree29001baf676d7d4ef4cd9462e9f2c6766ed6333a /webapp/components/textbox.jsx
parent2bf0342d130b3a77c5ed02e98e0857f28a5787f0 (diff)
downloadchat-165ad0d4f791f8ae2109472d8a626d911fa368e0.tar.gz
chat-165ad0d4f791f8ae2109472d8a626d911fa368e0.tar.bz2
chat-165ad0d4f791f8ae2109472d8a626d911fa368e0.zip
PLT-1378 Initial version of emoji reactions (#4520)
* Refactored emoji.json to support multiple aliases and emoji categories * Added custom category to emoji.jsx and stabilized all fields * Removed conflicting aliases for :mattermost: and :ca: * fixup after store changes * Added emoji reactions * Removed reactions for an emoji when that emoji is deleted * Fixed incorrect test case * Renamed ReactionList to ReactionListView * Fixed :+1: and :-1: not showing up as possible reactions * Removed text emoticons from emoji reaction autocomplete * Changed emoji reactions to be sorted by the order that they were first created * Set a maximum number of listeners for the ReactionStore * Removed unused code from Textbox component * Fixed reaction permissions * Changed error code when trying to modify reactions for another user * Fixed merge conflicts * Properly applied theme colours to reactions * Fixed ESLint and gofmt errors * Fixed ReactionListContainer to properly update when its post prop changes * Removed unnecessary escape characters from reaction regexes * Shared reaction message pattern between CreatePost and CreateComment * Removed an unnecessary select query when saving a reaction * Changed reactions route to be under /reactions * Fixed copyright dates on newly added files * Removed debug code that prevented all unit tests from being ran * Cleaned up unnecessary code for reactions * Renamed ReactionStore.List to ReactionStore.GetForPost
Diffstat (limited to 'webapp/components/textbox.jsx')
-rw-r--r--webapp/components/textbox.jsx11
1 files changed, 0 insertions, 11 deletions
diff --git a/webapp/components/textbox.jsx b/webapp/components/textbox.jsx
index 9192cd4f9..6ba925ed7 100644
--- a/webapp/components/textbox.jsx
+++ b/webapp/components/textbox.jsx
@@ -26,7 +26,6 @@ export default class Textbox extends React.Component {
this.focus = this.focus.bind(this);
this.recalculateSize = this.recalculateSize.bind(this);
- this.getStateFromStores = this.getStateFromStores.bind(this);
this.onRecievedError = this.onRecievedError.bind(this);
this.handleKeyPress = this.handleKeyPress.bind(this);
this.handleKeyDown = this.handleKeyDown.bind(this);
@@ -48,16 +47,6 @@ export default class Textbox extends React.Component {
}
}
- getStateFromStores() {
- const error = ErrorStore.getLastError();
-
- if (error) {
- return {message: error.message};
- }
-
- return {message: null};
- }
-
componentDidMount() {
ErrorStore.addChangeListener(this.onRecievedError);
}