diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-11-04 12:59:41 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-11-04 12:59:41 -0500 |
| commit | aee6d9b608aceb7b68ab1e1a583917c2c3ee4485 (patch) | |
| tree | 8908ba8d14cafe8dd1532cc429920b8c243dd465 /web/react/utils | |
| parent | 2840c317e5a88264aa044261558dda6d91ee1ff3 (diff) | |
| parent | a7ceba2e57f5b693afa51b0aefd04081646c6948 (diff) | |
| download | chat-aee6d9b608aceb7b68ab1e1a583917c2c3ee4485.tar.gz chat-aee6d9b608aceb7b68ab1e1a583917c2c3ee4485.tar.bz2 chat-aee6d9b608aceb7b68ab1e1a583917c2c3ee4485.zip | |
Merge pull request #1287 from hmhealey/plt382
PLT-382 Refactored some modals to use React-Bootstrap and added a confirmation when discarding theme changes
Diffstat (limited to 'web/react/utils')
| -rw-r--r-- | web/react/utils/channel_intro_mssages.jsx | 5 | ||||
| -rw-r--r-- | web/react/utils/constants.jsx | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/web/react/utils/channel_intro_mssages.jsx b/web/react/utils/channel_intro_mssages.jsx index b3f868456..161c79761 100644 --- a/web/react/utils/channel_intro_mssages.jsx +++ b/web/react/utils/channel_intro_mssages.jsx @@ -3,6 +3,7 @@ // See License.txt for license information. const Utils = require('./utils.jsx'); +const InviteMemberModal = require('../components/invite_member_modal.jsx'); const UserProfile = require('../components/user_profile.jsx'); const ChannelStore = require('../stores/channel_store.jsx'); const Constants = require('../utils/constants.jsx'); @@ -109,8 +110,7 @@ export function createDefaultIntroMessage(channel) { <a className='intro-links' href='#' - data-toggle='modal' - data-target='#invite_member' + onClick={InviteMemberModal.show} > <i className='fa fa-user-plus'></i>{'Invite others to this team'} </a> @@ -213,6 +213,7 @@ export function createStandardIntroMessage(channel) { > <i className='fa fa-user-plus'></i>{'Invite others to this ' + uiType} </a> + </div> ); } diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index 39be577df..b8d346ba7 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -39,7 +39,8 @@ module.exports = { RECIEVED_LOGS: null, RECIEVED_ALL_TEAMS: null, - TOGGLE_IMPORT_THEME_MODAL: null + TOGGLE_IMPORT_THEME_MODAL: null, + TOGGLE_INVITE_MEMBER_MODAL: null }), PayloadSources: keyMirror({ |