Improve getting of session. Update display of unnamed contacts. Rework updateContacts.

static/js/controllers/contactsmanagercontroller.js

@@ -21,56 +21,56 @@
 define([], function() {
 
 	// ContactsmanagerController
-	return ["$scope", "$modalInstance", "contactData", "data", "contacts", 'buddySession', function($scope, $modalInstance, contactData, data, contacts, buddySession) {
+	return ["$scope", "$modalInstance", "contactData", "data", "contacts", 'buddyData', 'safeApply', function($scope, $modalInstance, contactData, data, contacts, buddyData, safeApply) {
 		$scope.header = data.header;
 		$scope.contacts = [];
 		$scope.search = {};
 		$scope.contact = null;
-		$scope.session = null;
+		$scope.buddySyncable = false;
 
-		var tmp = {
-			displayName: data.contact ? data.contact.Status.displayName : null
-		};
 		var setContactInfo = function(contact) {
 			contacts.update(contact.Userid, contact.Status);
 		};
-		var updateContacts = function(async) {
-			if (async) {
-				$scope.$apply(function(scope) {
-					scope.contacts = contactData.getAll();
-				});
-			} else {
-				$scope.contacts = contactData.getAll();
-			}
+		var updateContacts = function() {
+			$scope.contacts = contactData.getAll();
+			safeApply($scope);
 		};
 		updateContacts();
 		contacts.e.on('contactadded', function() {
-			updateContacts(true);
+			updateContacts();
 		});
 		contacts.e.on('contactupdated', function() {
-			updateContacts(true);
+			updateContacts();
+		});
+		contacts.e.on('contactremoved', function() {
+			updateContacts();
 		});
 
 		// Values to check include 0, so check for number to get around incorrect 'false' type conversion
-		if(angular.isNumber(data.contactIndex)) {
+		if (angular.isNumber(data.contactIndex)) {
 			$scope.contact = $scope.contacts[data.contactIndex];
-			var sessions = buddySession.sessions();
-			for (var id in sessions) {
-				if (sessions.hasOwnProperty(id) && sessions[id].Userid === $scope.contact.Userid) {
-					$scope.session = sessions[id] ? sessions[id].sessions[id] : null;
-					//console.log('contact manager session', $scope.session);
-				}
+			var scope = buddyData.lookup($scope.contact.Userid, false, false);
+			if(scope) {
+				var session = scope.session.get();
+				$scope.buddySyncable = session.Type ? true : false;
 			}
 		}
+		var tmp = {
+			displayName: $scope.contact ? $scope.contact.Status.displayName : null
+		};
 
 		$scope.removeContact = function() {
+			// async, see contactremoved callback
 			contacts.remove($scope.contact.Userid);
-			updateContacts();
 			$modalInstance.close();
 		};
 
 		$scope.syncContactInfo = function() {
-			$scope.contact.Status.displayName = $scope.session.Status.displayName;
+			var scope = buddyData.lookup($scope.contact.Userid, false, false);
+			if(scope) {
+				var session = scope.session.get();
+				$scope.contact.Status.displayName = session.Status.displayName;
+			}
 		};
 
 		$scope.save = function() {

static/js/filters/displayname.js

@@ -29,7 +29,6 @@ define([], function() {
 		var user_text = translation._("User");
 		var someone_text = translation._("Someone");
 		var me_text = translation._("Me");
-		var contact_text = translation._("Unnamed Contact");
 		return function(id, me_ok) {
 			if (id === group_chat_id) {
 				return "";
@@ -39,9 +38,6 @@ define([], function() {
 				if (scope.display.displayName) {
 					return scope.display.displayName;
 				}
-				if(me_ok === "contactsmanager") {
-					return contact_text + " " + scope.buddyIndex;
-				}
 				return user_text + " " + scope.buddyIndex;
 			} else {
 				var data = appData.get();

static/js/services/contacts.js

@@ -278,7 +278,7 @@ define(['underscore', 'jquery', 'modernizr', 'sjcl', 'text!partials/contactsmana
 				var d = this.decrypt(data.contact);
 				if (d) {
 					var contact = contactData.addByData(d);
-					if (contact.Userid == userid) {
+					if (contact.Userid === userid) {
 						//console.log('found contact in database', contact);
 						updateContact(contact);
 					}

static/js/services/safeapply.js

@@ -22,7 +22,7 @@ define([], function() {
 
 	return ["$rootScope", function($rootScope) {
 		return function($scope, fn) {
-			var phase = $scope.$root.$$phase;
+			var phase = $scope.$root ? $scope.$root.$$phase : $scope.$$phase;
 			if (phase == '$apply' || phase == '$digest') {
 				if (fn) {
 					$scope.$eval(fn);

static/partials/contactsmanager.html

@@ -14,7 +14,7 @@
                 <div class="buddyPicture"><i class="fa fa-user"/><img ng-show="contact.Status.buddyPicture" alt ng-src="{{contact.Status.buddyPicture}}"/></div>
               </td>
               <td class="name">
-                <span>{{contact.Userid|displayName:'contactsmanager'}}</span>
+                <span>{{contact.Userid|displayName}}</span>
               </td>
               <td class="action">
                 <button class="btn btn-primary" ng-click="edit($index)">{{_('Edit')}}</button>

static/partials/contactsmanageredit.html

@@ -4,21 +4,19 @@
     <h3 class="modal-title" ng-bind-html="header"></h3>
   </div>
   <div  class="modal-body">
-    <div class="row">
-      <form class="form-horizontal">
+    <div class="row  form-horizontal">
         <div class="form-group">
-          <label class="col-xs-4 control-label">{{_('Name')}}</label>
+          <label for="contact-name" class="col-xs-4 control-label">{{_('Name')}}</label>
           <div class="col-xs-6">
-            <input placeholder="{{_('Unnamed')}}" type="text" class="form-control" ng-model="contact.Status.displayName">
+            <input id="contact-name" class="form-control" type="text" placeholder="{{_('Unnamed')}}" ng-model="contact.Status.displayName">
           </div>
         </div>
-        <div class="form-group" ng-if="session.Type">
-          <label class="col-xs-4 control-label">{{_('Sync')}}</label>
+        <div class="form-group" ng-if="buddySyncable">
+          <label for="contact-sync" class="col-xs-4 control-label">{{_('Sync')}}</label>
           <div class="col-xs-6">
-            <button class="btn btn-warning" ng-click="syncContactInfo()"><span class="fa fa-rotate-right"></span> {{_('Sync contact info')}}</button>
+            <button id="contact-sync" class="btn btn-warning" ng-click="syncContactInfo()"><span class="fa fa-rotate-right"></span> {{_('Sync contact info')}}</button>
           </div>
         </div>
-      </form>
     </div>
   </div>
   <div class="modal-footer">