IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Partially reverted 7e9cf13aa3 (#5295)

Browse Source
This commit is contained in:
Harrison Healey
2017-02-03 14:21:10 -05:00
committed by Christopher Speller
parent 9312469ad5
commit 948b557453
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webapp/client/test_web_client.jsx
View File

@@ -1,7 +0,0 @@
// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
import Client from './client.jsx';
var WebClient = new Client();
export default WebClient;

4
webapp/stores/emoji_store.jsx
View File

@@ -1,7 +1,6 @@
// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
import Client from '../client/web_client.jsx';
import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
import Constants from 'utils/constants.jsx';
import EventEmitter from 'events';
@@ -149,7 +148,8 @@ class EmojiStore extends EventEmitter {
getEmojiImageUrl(emoji) {
if (emoji.id) {
return Client.getCustomEmojiImageUrl(emoji.id);
// must match Client.getCustomEmojiImageUrl
return `/api/v3/emoji/${emoji.id}`;
}
const filename = emoji.filename || emoji.aliases[0];

1
webapp/webpack.config.js
View File

@@ -159,7 +159,6 @@ if (TEST) {
config.entry = ['babel-polyfill', './root.jsx'];
config.target = 'node';
config.externals = [nodeExternals()];
config.resolve.alias['./client/web_client.jsx'] = path.resolve(__dirname, 'client/test_web_client.jsx');
} else {
// For some reason these break mocha. So they go here.
config.plugins.push(