Adjustements and refactoring of the conversation name component

client/app/components/conversation/conversation.html

@@ -1,8 +1,8 @@
 <div class="conversation">
 
-	<online-user-list ng-if="conversationType == 'channel'"></online-user-list>
+	<conversation-name-channel ng-if="conversationType == 'channel'"></conversation-name-channel>
 
-	<conversation-name user="friend" ng-if="conversationType != 'channel'"></conversation-name>
+	<conversation-name-direct user="friend" ng-if="conversationType != 'channel'"></conversation-name-direct>
 
 	<message-list messages="conversation"></message-list>
 

client/app/components/conversation/conversation_name_channel.directive.js

@@ -0,0 +1,16 @@
+angular.module('app').directive('conversationNameChannel', function($rootScope,ConversationList) {
+  return {
+    restrict: "E",
+    replace: true,
+    templateUrl: 'components/conversation/conversation_name_channel.html',
+
+    controller: function($scope){
+
+      ConversationList.all().then(function(conversations){
+    		$scope.currentConversationName = ConversationList.find({channel: $scope.conversationChannel}).name;
+
+    	});
+      }
+	}
+
+});

client/app/components/conversation/conversation_name_direct.directive.js

@@ -0,0 +1,10 @@
+angular.module('app').directive('conversationNameDirect', function($rootScope) {
+  return {
+    restrict: "E",
+    replace: true,
+    templateUrl: 'components/conversation/conversation_name_direct.html',
+    scope: {
+      user: "="
+    }
+  };
+});

client/app/index.html

@@ -61,7 +61,6 @@
         <script src="services/notifications.service.js"></script>
 
         <script src="services/friends.service.js"></script>
-        <script src="services/online_users.service.js"></script>
         <script src="services/typing-indicator.service.js"></script>
         <script src="services/users-typing.service.js"></script>
 
@@ -71,20 +70,18 @@
 
         <script src="components/login/sign-in-with-github-button.directive.js"></script>
         <script src="components/conversation/conversation.directive.js"></script>
-        <script src="components/conversation/conversation_name.directive.js"></script>
+        <script src="components/conversation/conversation_name_direct.directive.js"></script>
+        <script src="components/conversation/conversation_name_channel.directive.js"></script>
 
         <script src="components/message-form/message-form.directive.js"></script>
         <script src="components/message-form/type-tracking.directive.js"></script>
         <script src="components/channels/channels.directive.js"></script>
         <script src="components/message-list/message-list.directive.js"></script>
         <script src="components/message-item/message-item.directive.js"></script>
-        <script src="components/online-user-list/online-user-list.directive.js"></script>
         <script src="components/typing-indicator-box/typing-indicator-box.directive.js"></script>
         <script src="components/friend-list/friend-list.directive.js"></script>
         <script src="components/friends-search-box/friends-search-box.directive.js"></script>
         <script src="components/user-menu/user-menu.directive.js"></script>
-
-        <script src="views/chat.controller.js"></script>
 
 
         <!-- endbuild -->