Removed usage of window.location.origin throughout the codebase
Этот коммит содержится в:
@@ -68,10 +68,10 @@ var NavbarDropdown = React.createClass({
|
|||||||
for (var i = 0; i < this.state.teams.length; i++) {
|
for (var i = 0; i < this.state.teams.length; i++) {
|
||||||
var teamName = this.state.teams[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 (
|
return (
|
||||||
<ul className="nav navbar-nav navbar-right">
|
<ul className="nav navbar-nav navbar-right">
|
||||||
|
|||||||
@@ -248,7 +248,7 @@ TeamURLPage = React.createClass({
|
|||||||
<div className="row">
|
<div className="row">
|
||||||
<div className="col-sm-11">
|
<div className="col-sm-11">
|
||||||
<div className="input-group">
|
<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}/>
|
<input type="text" ref="name" className="form-control" placeholder="" maxLength="128" defaultValue={this.props.state.team.name} autoFocus={true} onFocus={this.handleFocus}/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -566,7 +566,7 @@ PasswordPage = React.createClass({
|
|||||||
props.state.wizard = "finished";
|
props.state.wizard = "finished";
|
||||||
props.updateParent(props.state, true);
|
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,
|
// client.loginByEmail(teamSignup.team.domain, teamSignup.team.email, teamSignup.user.password,
|
||||||
// function(data) {
|
// function(data) {
|
||||||
|
|||||||
@@ -11,6 +11,12 @@ var BrowserStore = require('../stores/browser_store.jsx');
|
|||||||
|
|
||||||
var CHANGE_EVENT = 'change';
|
var CHANGE_EVENT = 'change';
|
||||||
|
|
||||||
|
var utils;
|
||||||
|
function getWindowLocationOrigin() {
|
||||||
|
if (!utils) utils = require('../utils/utils.jsx');
|
||||||
|
return utils.getWindowLocationOrigin();
|
||||||
|
}
|
||||||
|
|
||||||
var TeamStore = assign({}, EventEmitter.prototype, {
|
var TeamStore = assign({}, EventEmitter.prototype, {
|
||||||
emitChange: function() {
|
emitChange: function() {
|
||||||
this.emit(CHANGE_EVENT);
|
this.emit(CHANGE_EVENT);
|
||||||
@@ -58,7 +64,7 @@ var TeamStore = assign({}, EventEmitter.prototype, {
|
|||||||
return null;
|
return null;
|
||||||
},
|
},
|
||||||
getCurrentTeamUrl: function() {
|
getCurrentTeamUrl: function() {
|
||||||
return window.location.origin + "/" + this.getCurrent().name;
|
return getWindowLocationOrigin() + "/" + this.getCurrent().name;
|
||||||
},
|
},
|
||||||
storeTeam: function(team) {
|
storeTeam: function(team) {
|
||||||
var teams = this._getTeams();
|
var teams = this._getTeams();
|
||||||
|
|||||||
@@ -839,8 +839,9 @@ module.exports.getDisplayName = function(user) {
|
|||||||
|
|
||||||
//IE10 does not set window.location.origin automatically so this must be called instead when using it
|
//IE10 does not set window.location.origin automatically so this must be called instead when using it
|
||||||
module.exports.getWindowLocationOrigin = function() {
|
module.exports.getWindowLocationOrigin = function() {
|
||||||
if (!window.location.origin) {
|
var windowLocationOrigin = window.location.origin;
|
||||||
window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: '');
|
if (!windowLocationOrigin) {
|
||||||
|
windowLocationOrigin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: '');
|
||||||
}
|
}
|
||||||
return window.location.origin;
|
return windowLocationOrigin;
|
||||||
};
|
};
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user