Partially reverted 7e9cf13 (mattermost#5295)

mattermost-build · Feb 3, 2017 · 33228b0 · 33228b0
1 parent 027d91d
commit 33228b0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/client/test_web_client.jsx b/client/test_web_client.jsx
diff --git a/stores/emoji_store.jsx b/stores/emoji_store.jsx
@@ -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];

diff --git a/webpack.config.js b/webpack.config.js
@@ -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(