diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-11-19 21:12:56 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-11-19 21:12:56 -0500 |
commit | 55b831e4e1d3db3ffcf1d40247018783ca76af8d (patch) | |
tree | e817ed0fc96ae6ee8c1a39619adff070dd86f95d /web/react/utils/text_formatting.jsx | |
parent | 5c35c2631e59f895a7b0fb6761c1cae7aee60466 (diff) | |
download | chat-55b831e4e1d3db3ffcf1d40247018783ca76af8d.tar.gz chat-55b831e4e1d3db3ffcf1d40247018783ca76af8d.tar.bz2 chat-55b831e4e1d3db3ffcf1d40247018783ca76af8d.zip |
Upgrading client dependancies. Upgrading to babel 6. Moving to es6 package system.
Diffstat (limited to 'web/react/utils/text_formatting.jsx')
-rw-r--r-- | web/react/utils/text_formatting.jsx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx index 7f1d7175d..3a912fd75 100644 --- a/web/react/utils/text_formatting.jsx +++ b/web/react/utils/text_formatting.jsx @@ -1,12 +1,12 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const Autolinker = require('autolinker'); -const Constants = require('./constants.jsx'); -const Emoticons = require('./emoticons.jsx'); -const Markdown = require('./markdown.jsx'); -const UserStore = require('../stores/user_store.jsx'); -const Utils = require('./utils.jsx'); +import Autolinker from 'autolinker'; +import Constants from './constants.jsx'; +import * as Emoticons from './emoticons.jsx'; +import * as Markdown from './markdown.jsx'; +import UserStore from '../stores/user_store.jsx'; +import * as Utils from './utils.jsx'; // Performs formatting of user posts including highlighting mentions and search terms and converting urls, hashtags, and // @mentions to links by taking a user's message and returning a string of formatted html. Also takes a number of options |