Merge pull request #351 from rgarmsen2295/mm-1759

MM-1759 Fixes issue with team sign up link displaying incorrectly in ie10

2 files changed, 45 insertions, 32 deletions

diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index ba8f9bacd..72b8547e5 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -64,7 +64,7 @@ var NavbarDropdown = React.createClass({
             if (this.props.teamType === 'O') {
                 teamLink = (
                     <li>
-                        <a href='#' data-toggle='modal' data-target='#get_link' data-title='Team Invite' data-value={location.origin + '/signup_user_complete/?id=' + currentUser.team_id}>Get Team Invite Link</a>
+                        <a href='#' data-toggle='modal' data-target='#get_link' data-title='Team Invite' data-value={utils.getWindowLocationOrigin() + '/signup_user_complete/?id=' + currentUser.team_id}>Get Team Invite Link</a>
                     </li>
                 );
             }
diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx
index 15306a499..2439719a1 100644
--- a/web/react/components/sidebar_right_menu.jsx
+++ b/web/react/components/sidebar_right_menu.jsx
@@ -3,6 +3,7 @@
 
 var UserStore = require('../stores/user_store.jsx');
 var client = require('../utils/client.jsx');
+var utils = require('../utils/utils.jsx');
 
 module.exports = React.createClass({
     handleLogoutClick: function(e) {
@@ -10,65 +11,77 @@ module.exports = React.createClass({
         client.logout();
     },
     render: function() {
-        var team_link = "";
-        var invite_link = "";
-        var manage_link = "";
-        var rename_link = "";
-        var currentUser = UserStore.getCurrentUser()
+        var teamLink = '';
+        var inviteLink = '';
+        var teamSettingsLink = '';
+        var manageLink = '';
+        var renameLink = '';
+        var currentUser = UserStore.getCurrentUser();
         var isAdmin = false;
 
         if (currentUser != null) {
-            isAdmin = currentUser.roles.indexOf("admin") > -1;
+            isAdmin = currentUser.roles.indexOf('admin') > -1;
 
-            invite_link = (
+            inviteLink = (
                 <li>
-                    <a href="#" data-toggle="modal" data-target="#invite_member"><i className="glyphicon glyphicon-user"></i>Invite New Member</a>
+                    <a href='#' data-toggle='modal' data-target='#invite_member'><i className='glyphicon glyphicon-user'></i>Invite New Member</a>
                 </li>
             );
 
-            if (this.props.teamType == "O") {
-                team_link = (
+            if (this.props.teamType === 'O') {
+                teamLink = (
                     <li>
-                        <a href="#" data-toggle="modal" data-target="#get_link" data-title="Team Invite" data-value={location.origin+"/signup_user_complete/?id="+currentUser.team_id}><i className="glyphicon glyphicon-link"></i>Get Team Invite Link</a>
+                        <a href='#' data-toggle='modal' data-target='#get_link' data-title='Team Invite' data-value={utils.getWindowLocationOrigin()+'/signup_user_complete/?id='+currentUser.team_id}><i className='glyphicon glyphicon-link'></i>Get Team Invite Link</a>
                     </li>
                 );
             }
         }
 
         if (isAdmin) {
-            manage_link = (
+            teamSettingsLink = (
                 <li>
-                    <a href="#" data-toggle="modal" data-target="#team_members"><i className="glyphicon glyphicon-wrench"></i>Manage Team</a>
+                    <a href='#' data-toggle='modal' data-target='#team_settings'><i className='glyphicon glyphicon-globe'></i>Team Settings</a>
                 </li>
             );
-            rename_link = (
+            manageLink = (
                 <li>
-                    <a href="#" data-toggle="modal" data-target="#rename_team_link"><i className="glyphicon glyphicon-pencil"></i>Rename</a>
+                    <a href='#' data-toggle='modal' data-target='#team_members'><i className='glyphicon glyphicon-wrench'></i>Manage Team</a>
+                </li>
+            );
+            renameLink = (
+                <li>
+                    <a href='#' data-toggle='modal' data-target='#rename_team_link'><i className='glyphicon glyphicon-pencil'></i>Rename</a>
                 </li>
             );
         }
 
-        var siteName = config.SiteName != null ? config.SiteName : "";
-        var teamDisplayName = this.props.teamDisplayName ? this.props.teamDisplayName : siteName;
+        var siteName = '';
+        if (config.SiteName != null) {
+            siteName = config.SiteName;
+        }
+        var teamDisplayName = siteName;
+        if (this.props.teamDisplayName) {
+            teamDisplayName = this.props.teamDisplayName;
+        }
 
         return (
             <div>
-                <div className="team__header theme">
-                    <a className="team__name" href="/channels/town-square">{ teamDisplayName }</a>
+                <div className='team__header theme'>
+                    <a className='team__name' href='/channels/town-square'>{teamDisplayName}</a>
                 </div>
 
-                <div className="nav-pills__container">
-                    <ul className="nav nav-pills nav-stacked">
-                        <li><a href="#" data-toggle="modal" data-target="#user_settings1"><i className="glyphicon glyphicon-cog"></i>Account Settings</a></li>
-                        { isAdmin ? <li><a href="#" data-toggle="modal" data-target="#team_settings"><i className="glyphicon glyphicon-globe"></i>Team Settings</a></li> : "" }
-                        { invite_link }
-                        { team_link }
-                        { manage_link }
-                        { rename_link }
-                        <li><a href="#" onClick={this.handleLogoutClick}><i className="glyphicon glyphicon-log-out"></i>Logout</a></li>
-                        <li className="divider"></li>
-                        <li><a target="_blank" href="/static/help/configure_links.html"><i className="glyphicon glyphicon-question-sign"></i>Help</a></li>
-                        <li><a target="_blank" href="/static/help/configure_links.html"><i className="glyphicon glyphicon-earphone"></i>Report a Problem</a></li>
+                <div className='nav-pills__container'>
+                    <ul className='nav nav-pills nav-stacked'>
+                        <li><a href='#' data-toggle='modal' data-target='#user_settings1'><i className='glyphicon glyphicon-cog'></i>Account Settings</a></li>
+                        {teamSettingsLink}
+                        {inviteLink}
+                        {teamLink}
+                        {manageLink}
+                        {renameLink}
+                        <li><a href='#' onClick={this.handleLogoutClick}><i className='glyphicon glyphicon-log-out'></i>Logout</a></li>
+                        <li className='divider'></li>
+                        <li><a target='_blank' href='/static/help/configure_links.html'><i className='glyphicon glyphicon-question-sign'></i>Help</a></li>
+                        <li><a target='_blank' href='/static/help/configure_links.html'><i className='glyphicon glyphicon-earphone'></i>Report a Problem</a></li>
                     </ul>
                 </div>
             </div>