diff options
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/change_url_modal.jsx | 5 | ||||
-rw-r--r-- | webapp/components/channel_header.jsx | 2 | ||||
-rw-r--r-- | webapp/components/channel_info_modal.jsx | 3 | ||||
-rw-r--r-- | webapp/components/create_team/components/team_url.jsx | 2 | ||||
-rw-r--r-- | webapp/components/file_attachment.jsx | 2 | ||||
-rw-r--r-- | webapp/components/integrations/components/installed_incoming_webhook.jsx | 2 | ||||
-rw-r--r-- | webapp/components/login/login_controller.jsx | 2 | ||||
-rw-r--r-- | webapp/components/more_channels.jsx | 2 | ||||
-rw-r--r-- | webapp/components/more_direct_channels.jsx | 2 | ||||
-rw-r--r-- | webapp/components/navbar_dropdown.jsx | 4 | ||||
-rw-r--r-- | webapp/components/needs_team.jsx | 2 | ||||
-rw-r--r-- | webapp/components/new_channel_flow.jsx | 3 | ||||
-rw-r--r-- | webapp/components/popover_list_members.jsx | 3 | ||||
-rw-r--r-- | webapp/components/removed_from_channel_modal.jsx | 4 | ||||
-rw-r--r-- | webapp/components/search_results_item.jsx | 3 |
15 files changed, 23 insertions, 18 deletions
diff --git a/webapp/components/change_url_modal.jsx b/webapp/components/change_url_modal.jsx index 9a526a9ee..2219ff317 100644 --- a/webapp/components/change_url_modal.jsx +++ b/webapp/components/change_url_modal.jsx @@ -4,6 +4,7 @@ import ReactDOM from 'react-dom'; import Constants from 'utils/constants.jsx'; import {Modal, Tooltip, OverlayTrigger} from 'react-bootstrap'; +import TeamStore from 'stores/team_store.jsx'; import * as Utils from 'utils/utils.jsx'; import {FormattedMessage} from 'react-intl'; @@ -130,8 +131,8 @@ export default class ChangeUrlModal extends React.Component { serverError = <div className='form-group has-error'><p className='input__help error'>{this.props.serverError}</p></div>; } - const fullTeamUrl = Utils.getTeamURLFromAddressBar(); - const teamURL = Utils.getShortenedTeamURL(); + const fullTeamUrl = TeamStore.getCurrentTeamUrl(); + const teamURL = Utils.getShortenedTeamURL(TeamStore.getCurrentTeamUrl()); const urlTooltip = ( <Tooltip id='urlTooltip'>{fullTeamUrl}</Tooltip> ); diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index 573949a5e..f26105c7a 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -123,7 +123,7 @@ export default class ChannelHeader extends React.Component { }); const townsquare = ChannelStore.getByName('town-square'); - browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + townsquare.name); + browserHistory.push(TeamStore.getCurrentTeamRelativeUrl() + '/channels/' + townsquare.name); }, (err) => { AsyncClient.dispatchError(err, 'handleLeave'); diff --git a/webapp/components/channel_info_modal.jsx b/webapp/components/channel_info_modal.jsx index b0e2c63fa..7e0ff3873 100644 --- a/webapp/components/channel_info_modal.jsx +++ b/webapp/components/channel_info_modal.jsx @@ -5,6 +5,7 @@ import * as Utils from 'utils/utils.jsx'; import {FormattedMessage} from 'react-intl'; import {Modal} from 'react-bootstrap'; +import TeamStore from 'stores/team_store.jsx'; import * as TextFormatting from 'utils/text_formatting.jsx'; import React from 'react'; @@ -44,7 +45,7 @@ export default class ChannelInfoModal extends React.Component { channelIcon = (<span className='fa fa-lock'/>); } - const channelURL = Utils.getTeamURLFromAddressBar() + '/channels/' + channel.name; + const channelURL = TeamStore.getCurrentTeamUrl() + '/channels/' + channel.name; let channelPurpose = null; if (channel.purpose) { diff --git a/webapp/components/create_team/components/team_url.jsx b/webapp/components/create_team/components/team_url.jsx index 0fe047ccd..bcbe0a1a1 100644 --- a/webapp/components/create_team/components/team_url.jsx +++ b/webapp/components/create_team/components/team_url.jsx @@ -105,7 +105,7 @@ export default class TeamUrl extends React.Component { nameDivClass += ' has-error'; } - const title = `${Utils.getWindowLocationOrigin()}/`; + const title = `${window.mm_config.SiteURL}/`; const urlTooltip = ( <Tooltip id='urlTooltip'>{title}</Tooltip> ); diff --git a/webapp/components/file_attachment.jsx b/webapp/components/file_attachment.jsx index f9c361afc..cba9d8288 100644 --- a/webapp/components/file_attachment.jsx +++ b/webapp/components/file_attachment.jsx @@ -102,7 +102,7 @@ class FileAttachment extends React.Component { getFileInfoFromName(name) { var fileInfo = utils.splitFileLocation(name); - fileInfo.path = utils.getWindowLocationOrigin() + Client.getFilesRoute() + '/get' + fileInfo.path; + fileInfo.path = Client.getFilesRoute() + '/get' + fileInfo.path; return fileInfo; } diff --git a/webapp/components/integrations/components/installed_incoming_webhook.jsx b/webapp/components/integrations/components/installed_incoming_webhook.jsx index 2cf3f24b8..008000012 100644 --- a/webapp/components/integrations/components/installed_incoming_webhook.jsx +++ b/webapp/components/integrations/components/installed_incoming_webhook.jsx @@ -97,7 +97,7 @@ export default class InstalledIncomingWebhook extends React.Component { id='installed_integrations.url' defaultMessage='URL: {url}' values={{ - url: Utils.getWindowLocationOrigin() + '/hooks/' + incomingWebhook.id + url: window.mm_config.SiteURL + '/hooks/' + incomingWebhook.id }} /> </span> diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx index 52f36bb2a..69981cfd6 100644 --- a/webapp/components/login/login_controller.jsx +++ b/webapp/components/login/login_controller.jsx @@ -277,7 +277,7 @@ export default class LoginController extends React.Component { } createLoginOptions() { - const extraParam = Utils.getUrlParameter('extra'); + const extraParam = this.props.location.query.extra; let extraBox = ''; if (extraParam) { if (extraParam === Constants.SIGNIN_CHANGE) { diff --git a/webapp/components/more_channels.jsx b/webapp/components/more_channels.jsx index b7ffff712..724cd2f60 100644 --- a/webapp/components/more_channels.jsx +++ b/webapp/components/more_channels.jsx @@ -74,7 +74,7 @@ export default class MoreChannels extends React.Component { channel, () => { $(ReactDOM.findDOMNode(this.refs.modal)).modal('hide'); - browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + channel.name); + browserHistory.push(TeamStore.getCurrentTeamRelativeUrl() + '/channels/' + channel.name); this.setState({joiningChannel: ''}); }, (err) => { diff --git a/webapp/components/more_direct_channels.jsx b/webapp/components/more_direct_channels.jsx index c74df5d1d..24718387e 100644 --- a/webapp/components/more_direct_channels.jsx +++ b/webapp/components/more_direct_channels.jsx @@ -87,7 +87,7 @@ export default class MoreDirectChannels extends React.Component { Utils.openDirectChannelToUser( teammate, (channel) => { - browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + channel.name); + browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/' + channel.name); this.setState({loadingDMChannel: -1}); this.handleHide(); }, diff --git a/webapp/components/navbar_dropdown.jsx b/webapp/components/navbar_dropdown.jsx index 81bd31269..f82bd564e 100644 --- a/webapp/components/navbar_dropdown.jsx +++ b/webapp/components/navbar_dropdown.jsx @@ -88,7 +88,7 @@ export default class NavbarDropdown extends React.Component { return ( <li> - <Link to={'/' + Utils.getTeamNameFromUrl() + '/emoji'}> + <Link to={'/' + this.props.teamName + '/emoji'}> <FormattedMessage id='navbar_dropdown.emoji' defaultMessage='Custom Emoji' @@ -207,7 +207,7 @@ export default class NavbarDropdown extends React.Component { if (integrationsEnabled && (isAdmin || window.mm_config.EnableOnlyAdminIntegrations !== 'true')) { integrationsLink = ( <li> - <Link to={'/' + Utils.getTeamNameFromUrl() + '/integrations'}> + <Link to={'/' + this.props.teamName + '/integrations'}> <FormattedMessage id='navbar_dropdown.integrations' defaultMessage='Integrations' diff --git a/webapp/components/needs_team.jsx b/webapp/components/needs_team.jsx index a8c7b3508..27951db0f 100644 --- a/webapp/components/needs_team.jsx +++ b/webapp/components/needs_team.jsx @@ -73,7 +73,7 @@ export default class NeedsTeam extends React.Component { // Go to tutorial if we are first arriving const tutorialStep = PreferenceStore.getInt(Preferences.TUTORIAL_STEP, UserStore.getCurrentId(), 999); if (tutorialStep <= TutorialSteps.INTRO_SCREENS) { - browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/tutorial'); + browserHistory.push(TeamStore.getCurrentTeamRelativeUrl() + '/tutorial'); } } diff --git a/webapp/components/new_channel_flow.jsx b/webapp/components/new_channel_flow.jsx index e0ab2d5a1..abec799b5 100644 --- a/webapp/components/new_channel_flow.jsx +++ b/webapp/components/new_channel_flow.jsx @@ -3,6 +3,7 @@ import * as Utils from 'utils/utils.jsx'; import Client from 'client/web_client.jsx'; +import TeamStore from 'stores/team_store.jsx'; import UserStore from 'stores/user_store.jsx'; import NewChannelModal from './new_channel_modal.jsx'; @@ -117,7 +118,7 @@ class NewChannelFlow extends React.Component { }); this.props.onModalDismissed(); - browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + data2.channel.name); + browserHistory.push(TeamStore.getCurrentTeamRelativeUrl() + '/channels/' + data2.channel.name); } ); }, diff --git a/webapp/components/popover_list_members.jsx b/webapp/components/popover_list_members.jsx index 0b318d487..18bde1bc2 100644 --- a/webapp/components/popover_list_members.jsx +++ b/webapp/components/popover_list_members.jsx @@ -3,6 +3,7 @@ import $ from 'jquery'; +import TeamStore from 'stores/team_store.jsx'; import UserStore from 'stores/user_store.jsx'; import {Popover, Overlay} from 'react-bootstrap'; import * as Utils from 'utils/utils.jsx'; @@ -36,7 +37,7 @@ export default class PopoverListMembers extends React.Component { Utils.openDirectChannelToUser( teammate, (channel, channelAlreadyExisted) => { - browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + channel.name); + browserHistory.push(TeamStore.getCurrentTeamRelativeUrl() + '/channels/' + channel.name); if (channelAlreadyExisted) { this.closePopover(); } diff --git a/webapp/components/removed_from_channel_modal.jsx b/webapp/components/removed_from_channel_modal.jsx index 3bdceadf7..228132803 100644 --- a/webapp/components/removed_from_channel_modal.jsx +++ b/webapp/components/removed_from_channel_modal.jsx @@ -4,10 +4,10 @@ import $ from 'jquery'; import ReactDOM from 'react-dom'; import ChannelStore from 'stores/channel_store.jsx'; +import TeamStore from 'stores/team_store.jsx'; import UserStore from 'stores/user_store.jsx'; import BrowserStore from 'stores/browser_store.jsx'; -import * as Utils from 'utils/utils.jsx'; import {FormattedMessage} from 'react-intl'; import {browserHistory} from 'react-router/es6'; @@ -36,7 +36,7 @@ export default class RemovedFromChannelModal extends React.Component { var townSquare = ChannelStore.getByName('town-square'); setTimeout( () => { - browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + townSquare.name); + browserHistory.push(TeamStore.getCurrentTeamRelativeUrl() + '/channels/' + townSquare.name); }, 1); diff --git a/webapp/components/search_results_item.jsx b/webapp/components/search_results_item.jsx index 217cd5568..fb8b23a7f 100644 --- a/webapp/components/search_results_item.jsx +++ b/webapp/components/search_results_item.jsx @@ -4,6 +4,7 @@ import $ from 'jquery'; import UserProfile from './user_profile.jsx'; +import TeamStore from 'stores/team_store.jsx'; import UserStore from 'stores/user_store.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; @@ -151,7 +152,7 @@ export default class SearchResultsItem extends React.Component { this.hideSidebar(); } this.shrinkSidebar(); - browserHistory.push('/' + window.location.pathname.split('/')[1] + '/pl/' + post.id); + browserHistory.push(TeamStore.getCurrentTeamRelativeUrl() + '/pl/' + post.id); } } className='search-item__jump' |