diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-07-27 13:21:50 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-07-27 13:32:14 -0700 |
| commit | 91fa6c8da1cbf6647791fa43699eb310f990e7e9 (patch) | |
| tree | 99247161a74642d1e91d4fc9fbff6a1b57bcc5c4 /web/react/components | |
| parent | 52bf726ddfaa0d5010ce7a80fe1f03a485df9279 (diff) | |
| download | chat-91fa6c8da1cbf6647791fa43699eb310f990e7e9.tar.gz chat-91fa6c8da1cbf6647791fa43699eb310f990e7e9.tar.bz2 chat-91fa6c8da1cbf6647791fa43699eb310f990e7e9.zip | |
Removed usage of window.location.origin throughout the codebase
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/sidebar_header.jsx | 4 | ||||
| -rw-r--r-- | web/react/components/signup_team_complete.jsx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx index 5b442aeac..e7512934a 100644 --- a/web/react/components/sidebar_header.jsx +++ b/web/react/components/sidebar_header.jsx @@ -68,10 +68,10 @@ var NavbarDropdown = React.createClass({ for (var i = 0; i < this.state.teams.length; i++) { var teamName = this.state.teams[i]; - teams.push(<li key={ teamName }><a href={window.location.origin + "/" + teamName }>Switch to { teamName }</a></li>); + teams.push(<li key={ teamName }><a href={utils.getWindowLocationOrigin() + "/" + teamName }>Switch to { teamName }</a></li>); } } - teams.push(<li><a href={window.location.origin + "/signup_team" }>Create a New Team</a></li>); + teams.push(<li><a href={utils.getWindowLocationOrigin() + "/signup_team" }>Create a New Team</a></li>); return ( <ul className="nav navbar-nav navbar-right"> diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index 3e8a57308..11882c57f 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -248,7 +248,7 @@ TeamURLPage = React.createClass({ <div className="row"> <div className="col-sm-11"> <div className="input-group"> - <span className="input-group-addon">{ window.location.origin + "/" }</span> + <span className="input-group-addon">{ utils.getWindowLocationOrigin() + "/" }</span> <input type="text" ref="name" className="form-control" placeholder="" maxLength="128" defaultValue={this.props.state.team.name} autoFocus={true} onFocus={this.handleFocus}/> </div> </div> @@ -566,7 +566,7 @@ PasswordPage = React.createClass({ props.state.wizard = "finished"; props.updateParent(props.state, true); - window.location.href = window.location.origin + '/' + props.state.team.name + '/login?email=' + encodeURIComponent(teamSignup.team.email); + window.location.href = utils.getWindowLocationOrigin() + '/' + props.state.team.name + '/login?email=' + encodeURIComponent(teamSignup.team.email); // client.loginByEmail(teamSignup.team.domain, teamSignup.team.email, teamSignup.user.password, // function(data) { |