summaryrefslogtreecommitdiffstats
path: root/web/react/components/sidebar_header.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-07-29 08:32:48 -0400
committerChristopher Speller <crspeller@gmail.com>2015-07-29 08:32:48 -0400
commita9e9d10e41e6c3d1609095a6a370a4632d22e19c (patch)
tree310b919bf0044fc0f6c59abf5b0f7509e257cfa1 /web/react/components/sidebar_header.jsx
parent35fe9655c3164eead46b18db9e40c8b677cca636 (diff)
parent91fa6c8da1cbf6647791fa43699eb310f990e7e9 (diff)
downloadchat-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/sidebar_header.jsx')
-rw-r--r--web/react/components/sidebar_header.jsx4
1 files changed, 2 insertions, 2 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">