diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-09-25 16:38:11 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-09-25 16:38:11 +0500 |
commit | b1a7225f30e8443f87830a578c306b8f93e6587f (patch) | |
tree | 8c32b64ecf0e1f13db91d697638ca47a399d7c52 /web/react/components | |
parent | 6a4a73c2d37aa147e0aa2e157ca78ed275ef822b (diff) | |
download | chat-b1a7225f30e8443f87830a578c306b8f93e6587f.tar.gz chat-b1a7225f30e8443f87830a578c306b8f93e6587f.tar.bz2 chat-b1a7225f30e8443f87830a578c306b8f93e6587f.zip |
Bug fixes and UI improvements for multiple tickets
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/channel_loader.jsx | 2 | ||||
-rw-r--r-- | web/react/components/post_info.jsx | 2 | ||||
-rw-r--r-- | web/react/components/user_profile.jsx | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx index 39c86405c..ac4f57ce2 100644 --- a/web/react/components/channel_loader.jsx +++ b/web/react/components/channel_loader.jsx @@ -84,6 +84,8 @@ export default class ChannelLoader extends React.Component { }); }); + $('body').tooltip({selector: '[data-toggle=tooltip]', trigger: 'hover click'}); + $('body').on('mouseenter mouseleave', '.post', function mouseOver(ev) { if (ev.type === 'mouseenter') { $(this).parent('div').prev('.date-separator, .new-separator').addClass('hovered--after'); diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx index c38edf6a2..8ad2336fb 100644 --- a/web/react/components/post_info.jsx +++ b/web/react/components/post_info.jsx @@ -153,7 +153,9 @@ export default class PostInfo extends React.Component { <li className='post-header-col'> <time className='post-profile-time' + data-toggle='tooltip' title={`${utils.displayDate(post.create_at)} at ${utils.displayTime(post.create_at)}`} + data-placement='top' > {utils.displayDateTime(post.create_at)} </time> diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx index c5d028d31..61bf647ca 100644 --- a/web/react/components/user_profile.jsx +++ b/web/react/components/user_profile.jsx @@ -32,7 +32,6 @@ export default class UserProfile extends React.Component { componentDidMount() { UserStore.addChangeListener(this.onChange); $('#profile_' + this.uniqueId).popover({placement: 'right', container: 'body', trigger: 'hover', html: true, delay: {show: 200, hide: 100}}); - $('body').tooltip({selector: '[data-toggle=tooltip]', trigger: 'hover click'}); } componentWillUnmount() { UserStore.removeChangeListener(this.onChange); |