diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-07-29 08:32:48 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-07-29 08:32:48 -0400 |
| commit | a9e9d10e41e6c3d1609095a6a370a4632d22e19c (patch) | |
| tree | 310b919bf0044fc0f6c59abf5b0f7509e257cfa1 /web/react/components/signup_team_complete.jsx | |
| parent | 35fe9655c3164eead46b18db9e40c8b677cca636 (diff) | |
| parent | 91fa6c8da1cbf6647791fa43699eb310f990e7e9 (diff) | |
| download | chat-a9e9d10e41e6c3d1609095a6a370a4632d22e19c.tar.gz chat-a9e9d10e41e6c3d1609095a6a370a4632d22e19c.tar.bz2 chat-a9e9d10e41e6c3d1609095a6a370a4632d22e19c.zip | |
Merge pull request #252 from rgarmsen2295/ie10-image-regression-fix
Fixes issue with images not displaying in IE10 due to window.location.origin not being defined in IE10
Diffstat (limited to 'web/react/components/signup_team_complete.jsx')
| -rw-r--r-- | web/react/components/signup_team_complete.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index ebb40f17f..21f9edef1 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -261,7 +261,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> @@ -592,7 +592,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) { |