diff options
| -rw-r--r-- | web/react/components/channel_header.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/channel_loader.jsx | 11 | ||||
| -rw-r--r-- | web/react/components/new_channel_modal.jsx | 3 | ||||
| -rw-r--r-- | web/react/components/sidebar_right_menu.jsx | 4 | ||||
| -rw-r--r-- | web/react/utils/utils.jsx | 3 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_forms.scss | 1 |
6 files changed, 16 insertions, 8 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index 8d23ec646..b81936b57 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -55,7 +55,7 @@ export default class ChannelHeader extends React.Component { if (!Utils.areStatesEqual(newState, this.state)) { this.setState(newState); } - $('.channel-header__info .description').popover({placement: 'bottom', trigger: 'hover click', html: true, delay: {show: 500, hide: 500}}); + $('.channel-header__info .description').popover({placement: 'bottom', trigger: 'hover', html: true, delay: {show: 500, hide: 500}}); } onSocketChange(msg) { if (msg.action === 'new_user') { diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx index ce6f60f87..20ea34e15 100644 --- a/web/react/components/channel_loader.jsx +++ b/web/react/components/channel_loader.jsx @@ -90,11 +90,12 @@ export default class ChannelLoader extends React.Component { } /* Setup global mouse events */ - $('body').on('click.userpopover', function popOver(e) { - if ($(e.target).attr('data-toggle') !== 'popover' && - $(e.target).parents('.popover.in').length === 0) { - $('.user-popover').popover('hide'); - } + $('body').on('click', function hidePopover(e) { + $('[data-toggle="popover"]').each(function eachPopover() { + if (!$(this).is(e.target) && $(this).has(e.target).length === 0 && $('.popover').has(e.target).length === 0) { + $(this).popover('hide'); + } + }); }); $('body').on('mouseenter mouseleave', '.post', function mouseOver(ev) { diff --git a/web/react/components/new_channel_modal.jsx b/web/react/components/new_channel_modal.jsx index c43137744..c8ef59b4a 100644 --- a/web/react/components/new_channel_modal.jsx +++ b/web/react/components/new_channel_modal.jsx @@ -93,6 +93,7 @@ export default class NewChannelModal extends React.Component { <span> <Modal show={this.props.show} + bsSize='large' onHide={this.props.onModalDismissed} > <Modal.Header closeButton={true}> @@ -122,7 +123,7 @@ export default class NewChannelModal extends React.Component { /> {displayNameError} <p className='input__help dark'> - {'Channel URL: ' + prettyTeamURL + this.props.channelData.name + ' ('} + {'URL: ' + prettyTeamURL + this.props.channelData.name + ' ('} <a href='#' onClick={this.props.onChangeURLPressed} diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx index 2671d560b..f1341d9d7 100644 --- a/web/react/components/sidebar_right_menu.jsx +++ b/web/react/components/sidebar_right_menu.jsx @@ -6,6 +6,10 @@ var client = require('../utils/client.jsx'); var utils = require('../utils/utils.jsx'); export default class SidebarRightMenu extends React.Component { + componentDidMount() { + $('.sidebar--left .dropdown-menu').perfectScrollbar(); + } + constructor(props) { super(props); diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 074591489..6e660286b 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -955,7 +955,8 @@ export function getTeamURLFromAddressBar() { export function getShortenedTeamURL() { const teamURL = getTeamURLFromAddressBar(); - if (teamURL.length > 24) { + if (teamURL.length > 35) { return teamURL.substring(0, 10) + '...' + teamURL.substring(teamURL.length - 12, teamURL.length) + '/'; } + return teamURL + '/'; } diff --git a/web/sass-files/sass/partials/_forms.scss b/web/sass-files/sass/partials/_forms.scss index c8b08f44d..65ea161d4 100644 --- a/web/sass-files/sass/partials/_forms.scss +++ b/web/sass-files/sass/partials/_forms.scss @@ -18,6 +18,7 @@ .input__help { color: #777; margin: 10px 0 0 10px; + word-break: break-word; &.dark { color: #222; } |