diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-02-18 17:34:06 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-02-18 17:34:06 -0500 |
commit | 6e4c0ddef678aa5a599adc1ab92dfff4f77d0eb2 (patch) | |
tree | fb43b39b9bd69501d1ed478056ba8047441e52a5 /web/react/components/rhs_root_post.jsx | |
parent | 3c5744f0d60f69ae54b2a87e097dd582547fbc32 (diff) | |
parent | 6cc67e58f2dfc4efc019026f60b6b550d6cc06df (diff) | |
download | chat-6e4c0ddef678aa5a599adc1ab92dfff4f77d0eb2.tar.gz chat-6e4c0ddef678aa5a599adc1ab92dfff4f77d0eb2.tar.bz2 chat-6e4c0ddef678aa5a599adc1ab92dfff4f77d0eb2.zip |
Merge pull request #2192 from rgarmsen2295/plt-1622
PLT-1622 Removed ability to copy a permalink on mobile
Diffstat (limited to 'web/react/components/rhs_root_post.jsx')
-rw-r--r-- | web/react/components/rhs_root_post.jsx | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx index 54f2e8262..adf66da85 100644 --- a/web/react/components/rhs_root_post.jsx +++ b/web/react/components/rhs_root_post.jsx @@ -5,7 +5,7 @@ import ChannelStore from '../stores/channel_store.jsx'; import UserProfile from './user_profile.jsx'; import UserStore from '../stores/user_store.jsx'; import * as TextFormatting from '../utils/text_formatting.jsx'; -import * as utils from '../utils/utils.jsx'; +import * as Utils from '../utils/utils.jsx'; import * as Emoji from '../utils/emoticons.jsx'; import FileAttachmentList from './file_attachment_list.jsx'; import twemoji from 'twemoji'; @@ -40,7 +40,7 @@ export default class RhsRootPost extends React.Component { this.parseEmojis(); } shouldComponentUpdate(nextProps) { - if (!utils.areObjectsEqual(nextProps.post, this.props.post)) { + if (!Utils.areObjectsEqual(nextProps.post, this.props.post)) { return true; } @@ -53,7 +53,7 @@ export default class RhsRootPost extends React.Component { var post = this.props.post; var currentUser = UserStore.getCurrentUser(); var isOwner = currentUser.id === post.user_id; - var isAdmin = utils.isAdmin(currentUser.roles); + var isAdmin = Utils.isAdmin(currentUser.roles); var timestamp = UserStore.getProfile(post.user_id).update_at; var channel = ChannelStore.get(post.channel_id); @@ -68,7 +68,7 @@ export default class RhsRootPost extends React.Component { } var systemMessageClass = ''; - if (utils.isSystemMessage(post)) { + if (Utils.isSystemMessage(post)) { systemMessageClass = 'post--system'; } @@ -88,22 +88,24 @@ export default class RhsRootPost extends React.Component { var dropdownContents = []; - dropdownContents.push( - <li - key='rhs-root-permalink' - role='presentation' - > - <a - href='#' - onClick={this.handlePermalink} + if (!Utils.isMobile()) { + dropdownContents.push( + <li + key='rhs-root-permalink' + role='presentation' > - <FormattedMessage - id='rhs_root.permalink' - defaultMessage='Permalink' - /> - </a> - </li> - ); + <a + href='#' + onClick={this.handlePermalink} + > + <FormattedMessage + id='rhs_root.permalink' + defaultMessage='Permalink' + /> + </a> + </li> + ); + } if (isOwner) { dropdownContents.push( @@ -198,7 +200,7 @@ export default class RhsRootPost extends React.Component { } botIndicator = <li className='col col__name bot-indicator'>{'BOT'}</li>; - } else if (utils.isSystemMessage(post)) { + } else if (Utils.isSystemMessage(post)) { userProfile = ( <UserProfile userId={''} @@ -209,12 +211,12 @@ export default class RhsRootPost extends React.Component { ); } - let src = '/api/v1/users/' + post.user_id + '/image?time=' + timestamp + '&' + utils.getSessionIndex(); + let src = '/api/v1/users/' + post.user_id + '/image?time=' + timestamp + '&' + Utils.getSessionIndex(); if (post.props && post.props.from_webhook && global.window.mm_config.EnablePostIconOverride === 'true') { if (post.props.override_icon_url) { src = post.props.override_icon_url; } - } else if (utils.isSystemMessage(post)) { + } else if (Utils.isSystemMessage(post)) { src = Constants.SYSTEM_MESSAGE_PROFILE_IMAGE; } |