From 3cf729dcaa27bb98c8eae963a86f5a79fa0b20be Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 25 Sep 2015 18:54:02 +0500 Subject: Using react tooltip for timestamp in center channel instead of normal bootstrap --- web/react/components/channel_loader.jsx | 2 -- web/react/components/post_info.jsx | 18 +++++++++++------- web/react/components/user_profile.jsx | 1 + 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 = {utils.displayDate(post.create_at)} at ${utils.displayTime(post.create_at)}; + return (