diff options
author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2017-02-08 00:20:01 +0900 |
---|---|---|
committer | enahum <nahumhbl@gmail.com> | 2017-02-07 07:20:01 -0800 |
commit | 68a05653ea6f2588a27c8ce523b0d213e48f6480 (patch) | |
tree | 4b99b1f3424ae83a4908386d53caa7dd09f8bf54 /webapp/components/channel_header.jsx | |
parent | 9bdea0de80a21b214eb9041057ab8e3fea681a8b (diff) | |
download | chat-68a05653ea6f2588a27c8ce523b0d213e48f6480.tar.gz chat-68a05653ea6f2588a27c8ce523b0d213e48f6480.tar.bz2 chat-68a05653ea6f2588a27c8ce523b0d213e48f6480.zip |
Add webapp/utils/url.jsx (#5285)
webapp/utils/utils.jsx got big and that caused a potential circular
dependency with webapp/stores/team_store.jsx. This change solves the
issue by introducing webapp/utils/url.jsx and moving URL-related
functions, which is not likely to depend on actions and stores, from
webapp/utils/utils.jsx.
Diffstat (limited to 'webapp/components/channel_header.jsx')
-rw-r--r-- | webapp/components/channel_header.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index e83d493f4..54e73cda5 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -28,6 +28,7 @@ import * as WebrtcActions from 'actions/webrtc_actions.jsx'; import * as ChannelActions from 'actions/channel_actions.jsx'; import * as Utils from 'utils/utils.jsx'; import * as ChannelUtils from 'utils/channel_utils.jsx'; +import {getSiteURL} from 'utils/url.jsx'; import * as TextFormatting from 'utils/text_formatting.jsx'; import {getFlaggedPosts} from 'actions/post_actions.jsx'; @@ -582,7 +583,7 @@ export default class ChannelHeader extends React.Component { let headerText; if (this.state.enableFormatting) { - headerText = TextFormatting.formatText(channel.header, {singleline: true, mentionHighlight: false, siteURL: Utils.getSiteURL()}); + headerText = TextFormatting.formatText(channel.header, {singleline: true, mentionHighlight: false, siteURL: getSiteURL()}); } else { headerText = channel.header; } |