From dc2f2a800105b77e665ec2a00c6290f35b1a2ba3 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 5 Jul 2016 11:58:18 -0400 Subject: PLT-3145 Custom Emojis (#3381) * Reorganized Backstage code to use a view controller and separated it from integrations code * Renamed InstalledIntegrations component to BackstageList * Added EmojiList page * Added AddEmoji page * Added custom emoji to autocomplete and text formatter * Moved system emoji to EmojiStore * Stopped trying to get emoji before logging in * Rerender posts when emojis change * Fixed submit handler on backstage pages to properly support enter * Removed debugging code * Updated javascript driver * Fixed unit tests * Fixed backstage routes * Added clientside validation to prevent users from creating an emoji with the same name as a system one * Fixed AddEmoji page to properly redirect when an emoji is created successfully * Fixed updating emoji list when an emoji is deleted * Added type prop to BackstageList to properly support using a table for the list * Added help text to EmojiList * Fixed backstage on smaller screen sizes * Disable custom emoji by default * Improved restrictions on creating emojis * Fixed non-admin users seeing the option to delete each other's emojis * Fixing gofmt * Fixed emoji unit tests * Fixed trying to get emoji from the server when it's disabled --- webapp/routes/route_emoji.jsx | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 webapp/routes/route_emoji.jsx (limited to 'webapp/routes/route_emoji.jsx') diff --git a/webapp/routes/route_emoji.jsx b/webapp/routes/route_emoji.jsx new file mode 100644 index 000000000..207c81172 --- /dev/null +++ b/webapp/routes/route_emoji.jsx @@ -0,0 +1,24 @@ +// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +import * as RouteUtils from 'routes/route_utils.jsx'; + +export default { + path: 'emoji', + getComponents: (location, callback) => { + System.import('components/backstage/backstage_controller.jsx').then(RouteUtils.importComponentSuccess(callback)); + }, + indexRoute: { + getComponents: (location, callback) => { + System.import('components/emoji/components/emoji_list.jsx').then(RouteUtils.importComponentSuccess(callback)); + } + }, + childRoutes: [ + { + path: 'add', + getComponents: (location, callback) => { + System.import('components/emoji/components/add_emoji.jsx').then(RouteUtils.importComponentSuccess(callback)); + } + } + ] +}; -- cgit v1.2.3-1-g7c22