diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-09-25 18:54:02 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-09-25 18:54:02 +0500 |
commit | 3cf729dcaa27bb98c8eae963a86f5a79fa0b20be (patch) | |
tree | 82cfacc0e61fa7a55df7ea01dad7f78746056a4c /web | |
parent | 7964150cb20bd8786db018a6639b6d092a01e1f7 (diff) | |
download | chat-3cf729dcaa27bb98c8eae963a86f5a79fa0b20be.tar.gz chat-3cf729dcaa27bb98c8eae963a86f5a79fa0b20be.tar.bz2 chat-3cf729dcaa27bb98c8eae963a86f5a79fa0b20be.zip |
Using react tooltip for timestamp in center channel instead of normal bootstrap
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/channel_loader.jsx | 2 | ||||
-rw-r--r-- | web/react/components/post_info.jsx | 18 | ||||
-rw-r--r-- | web/react/components/user_profile.jsx | 1 | ||||
-rw-r--r-- | web/templates/channel.html | 1 |
4 files changed, 13 insertions, 9 deletions
diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx index ac4f57ce2..39c86405c 100644 --- a/web/react/components/channel_loader.jsx +++ b/web/react/components/channel_loader.jsx @@ -84,8 +84,6 @@ 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 8ad2336fb..824e7ef39 100644 --- a/web/react/components/post_info.jsx +++ b/web/react/components/post_info.jsx @@ -5,6 +5,8 @@ var UserStore = require('../stores/user_store.jsx'); var utils = require('../utils/utils.jsx'); var Constants = require('../utils/constants.jsx'); +var Tooltip = ReactBootstrap.Tooltip; +var OverlayTrigger = ReactBootstrap.OverlayTrigger; export default class PostInfo extends React.Component { constructor(props) { @@ -148,17 +150,19 @@ export default class PostInfo extends React.Component { var dropdown = this.createDropdown(); + let tooltip = <Tooltip>{utils.displayDate(post.create_at)} at ${utils.displayTime(post.create_at)}</Tooltip>; + return ( <ul className='post-header post-info'> <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' + <OverlayTrigger + placement='top' + overlay={tooltip} > - {utils.displayDateTime(post.create_at)} - </time> + <time className='post-profile-time'> + {utils.displayDateTime(post.create_at)} + </time> + </OverlayTrigger> </li> <li className='post-header-col post-header__reply'> <div className='dropdown'> diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx index 61bf647ca..c5d028d31 100644 --- a/web/react/components/user_profile.jsx +++ b/web/react/components/user_profile.jsx @@ -32,6 +32,7 @@ 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); diff --git a/web/templates/channel.html b/web/templates/channel.html index b5fe4de01..2af94e415 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -53,6 +53,7 @@ <div id="register_app_modal"></div> <script> window.setup_channel_page({{ .Props }}); + $('body').tooltip( {selector: '[data-toggle=tooltip]'} ); $('.modal-body').css('max-height', $(window).height() * 0.7); $('.modal-body').perfectScrollbar(); </script> |