diff options
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/actions/global_actions.jsx | 24 | ||||
-rw-r--r-- | webapp/client/client.jsx | 12 | ||||
-rw-r--r-- | webapp/client/web_client.jsx | 5 | ||||
-rw-r--r-- | webapp/components/logged_in.jsx | 4 | ||||
-rw-r--r-- | webapp/components/rhs_comment.jsx | 21 | ||||
-rw-r--r-- | webapp/components/rhs_dropdown.jsx | 61 | ||||
-rw-r--r-- | webapp/components/rhs_dropdown_menu.jsx | 22 | ||||
-rw-r--r-- | webapp/components/rhs_root_post.jsx | 19 |
8 files changed, 118 insertions, 50 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index f7c4c455c..a70462295 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -50,13 +50,13 @@ export function emitChannelClickEvent(channel) { AsyncClient.updateLastViewedAt(chan.id); loadPosts(chan.id); trackPage(); + }); - AppDispatcher.handleViewAction({ - type: ActionTypes.CLICK_CHANNEL, - name: chan.name, - id: chan.id, - prev: ChannelStore.getCurrentId() - }); + AppDispatcher.handleViewAction({ + type: ActionTypes.CLICK_CHANNEL, + name: chan.name, + id: chan.id, + prev: ChannelStore.getCurrentId() }); } @@ -461,21 +461,23 @@ export function emitRemoteUserTypingEvent(channelId, userId, postParentId) { }); } -export function emitUserLoggedOutEvent(redirectTo) { - const rURL = (redirectTo && typeof redirectTo === 'string') ? redirectTo : '/'; +export function emitUserLoggedOutEvent(redirectTo = '/', shouldSignalLogout = true) { Client.logout( () => { - BrowserStore.signalLogout(); + if (shouldSignalLogout) { + BrowserStore.signalLogout(); + } + BrowserStore.clear(); ErrorStore.clearLastError(); PreferenceStore.clear(); UserStore.clear(); TeamStore.clear(); newLocalizationSelected(global.window.mm_config.DefaultClientLocale); - browserHistory.push(rURL); + browserHistory.push(redirectTo); }, () => { - browserHistory.push(rURL); + browserHistory.push(redirectTo); } ); } diff --git a/webapp/client/client.jsx b/webapp/client/client.jsx index a615bd501..3ce6977f6 100644 --- a/webapp/client/client.jsx +++ b/webapp/client/client.jsx @@ -206,7 +206,12 @@ export default class Client { } if (successCallback) { - successCallback(res.body, res); + if (res.body) { + successCallback(res.body, res); + } else { + console.error('Missing response body for ' + methodName); // eslint-disable-line no-console + successCallback('', res); + } } } @@ -1952,6 +1957,11 @@ export default class Client { if (err) { return error(err); } + + if (!res.body) { + console.error('Missing response body for samlCertificateStatus'); // eslint-disable-line no-console + } + return success(res.body); }); } diff --git a/webapp/client/web_client.jsx b/webapp/client/web_client.jsx index d6474f1d9..5d2696c37 100644 --- a/webapp/client/web_client.jsx +++ b/webapp/client/web_client.jsx @@ -92,6 +92,11 @@ class WebClientClass extends Client { if (err) { return error(err); } + + if (!res.body) { + console.error('Missing response body for getYoutubeVideoInfo'); // eslint-disable-line no-console + } + return success(res.body); }); } diff --git a/webapp/components/logged_in.jsx b/webapp/components/logged_in.jsx index 4e7df0392..ec4ca2a6a 100644 --- a/webapp/components/logged_in.jsx +++ b/webapp/components/logged_in.jsx @@ -14,8 +14,6 @@ import {loadEmoji} from 'actions/emoji_actions.jsx'; import * as Utils from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; -import {browserHistory} from 'react-router/es6'; - const BACKSPACE_CHAR = 8; import $ from 'jquery'; @@ -41,7 +39,7 @@ export default class LoggedIn extends React.Component { } console.log('detected logout from a different tab'); //eslint-disable-line no-console - browserHistory.push('/'); + GlobalActions.emitUserLoggedOutEvent('/', false); } if (e.originalEvent.key === '__login__' && e.originalEvent.storageArea === localStorage && e.originalEvent.newValue) { diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx index c7b005845..416c0fe4b 100644 --- a/webapp/components/rhs_comment.jsx +++ b/webapp/components/rhs_comment.jsx @@ -6,6 +6,7 @@ import FileAttachmentListContainer from './file_attachment_list_container.jsx'; import PendingPostOptions from 'components/post_view/components/pending_post_options.jsx'; import PostMessageContainer from 'components/post_view/components/post_message_container.jsx'; import ProfilePicture from 'components/profile_picture.jsx'; +import RhsDropdown from 'components/rhs_dropdown.jsx'; import TeamStore from 'stores/team_store.jsx'; import UserStore from 'stores/user_store.jsx'; @@ -218,24 +219,8 @@ export default class RhsComment extends React.Component { } return ( - <div className='dropdown'> - <a - href='#' - className='post__dropdown dropdown-toggle' - type='button' - data-toggle='dropdown' - aria-expanded='false' - /> - <div className='dropdown-menu__content'> - <ul - className='dropdown-menu' - role='menu' - > - {dropdownContents} - </ul> - </div> - </div> - ); + <RhsDropdown dropdownContents={dropdownContents}/> + ); } render() { diff --git a/webapp/components/rhs_dropdown.jsx b/webapp/components/rhs_dropdown.jsx new file mode 100644 index 000000000..c42e8c8e5 --- /dev/null +++ b/webapp/components/rhs_dropdown.jsx @@ -0,0 +1,61 @@ +// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +import * as Agent from 'utils/user_agent.jsx'; +import RhsDropdownMenu from 'components/rhs_dropdown_menu.jsx'; + +import {Dropdown} from 'react-bootstrap'; +import React from 'react'; + +export default class RhsDropdown extends React.Component { + constructor(props) { + super(props); + + this.toggleDropdown = this.toggleDropdown.bind(this); + + this.state = { + showDropdown: false + }; + } + + toggleDropdown(e) { + if (e) { + e.preventDefault(); + } + + const showDropdown = !this.state.showDropdown; + if (Agent.isMobile() || Agent.isMobileApp()) { + const scroll = document.querySelector('.scrollbar--view'); + if (showDropdown) { + scroll.style.overflow = 'hidden'; + } else { + scroll.style.overflow = 'scroll'; + } + } + + this.setState({showDropdown}); + } + + render() { + return ( + <Dropdown + open={this.state.showDropdown} + onClose={this.toggleDropdown} + > + <a + href='#' + className='post__dropdown dropdown-toggle' + bsRole='toggle' + onClick={this.toggleDropdown} + /> + <RhsDropdownMenu> + {this.props.dropdownContents} + </RhsDropdownMenu> + </Dropdown> + ); + } +} + +RhsDropdown.propTypes = { + dropdownContents: React.PropTypes.array.isRequired +}; diff --git a/webapp/components/rhs_dropdown_menu.jsx b/webapp/components/rhs_dropdown_menu.jsx new file mode 100644 index 000000000..6efaa9dea --- /dev/null +++ b/webapp/components/rhs_dropdown_menu.jsx @@ -0,0 +1,22 @@ +// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +import {Dropdown} from 'react-bootstrap'; +import React from 'react'; + +export default class RhsDropdownMenu extends Dropdown.Menu { + constructor(props) { //eslint-disable-line no-useless-constructor + super(props); + } + + render() { + return ( + <div + className='dropdown-menu__content' + onClick={this.props.onClose} + > + {super.render()} + </div> + ); + } +} diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx index aa663bda7..0dae5976f 100644 --- a/webapp/components/rhs_root_post.jsx +++ b/webapp/components/rhs_root_post.jsx @@ -6,6 +6,7 @@ import PostBodyAdditionalContent from 'components/post_view/components/post_body import PostMessageContainer from 'components/post_view/components/post_message_container.jsx'; import FileAttachmentListContainer from './file_attachment_list_container.jsx'; import ProfilePicture from 'components/profile_picture.jsx'; +import RhsDropdown from 'components/rhs_dropdown.jsx'; import ChannelStore from 'stores/channel_store.jsx'; import UserStore from 'stores/user_store.jsx'; @@ -228,23 +229,7 @@ export default class RhsRootPost extends React.Component { var rootOptions = ''; if (dropdownContents.length > 0) { rootOptions = ( - <div className='dropdown'> - <a - href='#' - className='post__dropdown dropdown-toggle' - type='button' - data-toggle='dropdown' - aria-expanded='false' - /> - <div className='dropdown-menu__content'> - <ul - className='dropdown-menu' - role='menu' - > - {dropdownContents} - </ul> - </div> - </div> + <RhsDropdown dropdownContents={dropdownContents}/> ); } |