Merge pull request #843 from rgarmsen2295/plt-138

PLT-138 Better parsing of the site's title when viewing a channel

5 files changed, 13 insertions, 24 deletions

diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx
index b7bce9b34..54d77c358 100644
--- a/web/react/components/more_direct_channels.jsx
+++ b/web/react/components/more_direct_channels.jsx
@@ -43,7 +43,7 @@ export default class MoreDirectChannels extends React.Component {
 
                 handleClick = function clickHandler(e) {
                     e.preventDefault();
-                    utils.switchChannel(channel, channel.teammate_username);
+                    utils.switchChannel(channel);
                     $(React.findDOMNode(self.refs.modal)).modal('hide');
                 };
             } else {
diff --git a/web/react/components/rename_channel_modal.jsx b/web/react/components/rename_channel_modal.jsx
index 37958b649..9d514c741 100644
--- a/web/react/components/rename_channel_modal.jsx
+++ b/web/react/components/rename_channel_modal.jsx
@@ -78,7 +78,6 @@ export default class RenameChannelModal extends React.Component {
                 $(React.findDOMNode(this.refs.modal)).modal('hide');
 
                 AsyncClient.getChannel(channel.id);
-                Utils.updateTabTitle(channel.display_name);
                 Utils.updateAddressBar(channel.name);
 
                 React.findDOMNode(this.refs.displayName).value = '';
diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx
index 32b521560..bdefdbee8 100644
--- a/web/react/components/search_results_item.jsx
+++ b/web/react/components/search_results_item.jsx
@@ -47,13 +47,8 @@ export default class SearchResultsItem extends React.Component {
         );
 
         var postChannel = ChannelStore.get(this.props.post.channel_id);
-        var teammate = '';
 
-        if (postChannel.type === 'D') {
-            teammate = utils.getDirectTeammate(this.props.post.channel_id).username;
-        }
-
-        utils.switchChannel(postChannel, teammate);
+        utils.switchChannel(postChannel);
     }
 
     render() {
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 14664ed4d..6033f200f 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -268,14 +268,19 @@ export default class Sidebar extends React.Component {
         }
     }
     updateTitle() {
-        var channel = ChannelStore.getCurrent();
+        const channel = ChannelStore.getCurrent();
         if (channel) {
+            let currentSiteName = '';
+            if (global.window.config.SiteName != null) {
+                currentSiteName = global.window.config.SiteName;
+            }
+
+            let currentChannelName = channel.display_name;
             if (channel.type === 'D') {
-                var teammateUsername = Utils.getDirectTeammate(channel.id).username;
-                document.title = teammateUsername + ' ' + document.title.substring(document.title.lastIndexOf('-'));
-            } else {
-                document.title = channel.display_name + ' ' + document.title.substring(document.title.lastIndexOf('-'));
+                currentChannelName = Utils.getDirectTeammate(channel.id).username;
             }
+
+            document.title = currentChannelName + ' - ' + this.props.teamDisplayName + ' ' + currentSiteName;
         }
     }
     onScroll() {
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 9425f3ea6..be11c2e40 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -637,16 +637,12 @@ export function isValidUsername(name) {
     return error;
 }
 
-export function updateTabTitle(name) {
-    document.title = name + ' ' + document.title.substring(document.title.lastIndexOf('-'));
-}
-
 export function updateAddressBar(channelName) {
     var teamURL = window.location.href.split('/channels')[0];
     history.replaceState('data', '', teamURL + '/channels/' + channelName);
 }
 
-export function switchChannel(channel, teammateName) {
+export function switchChannel(channel) {
     AppDispatcher.handleViewAction({
         type: ActionTypes.CLICK_CHANNEL,
         name: channel.name,
@@ -655,12 +651,6 @@ export function switchChannel(channel, teammateName) {
 
     updateAddressBar(channel.name);
 
-    if (channel.type === 'D' && teammateName) {
-        updateTabTitle(teammateName);
-    } else {
-        updateTabTitle(channel.display_name);
-    }
-
     AsyncClient.getChannels(true, true, true);
     AsyncClient.getChannelExtraInfo(true);
     AsyncClient.getPosts(channel.id);