First contact load fix, group load and order fix #312

owncloud · Mar 31, 2016 · 130ae25 · 130ae25
1 parent 3da03eb
commit 130ae25
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/js/components/contactList/contactList_controller.js b/js/components/contactList/contactList_controller.js
@@ -66,18 +66,22 @@ angular.module('contactsApp')
 		});
 	});
 
+	// Get contacts
 	ContactService.getAll().then(function(contacts) {
 		$scope.$apply(function() {
 			ctrl.contacts = contacts;
-			if (!_.isEmpty(ctrl.contacts)) {
-				ctrl.setSelectedId(_.sortBy(contacts, function(contact) {
-					return contact.fullName();
-				})[0].uid());
-			}
-			ctrl.loading = false;
 		});
 	});
 
+	// Wait for ctrl.contactList to be updated, load the first contact and kill the watch
+	var unbindListWatch = $scope.$watch('ctrl.contactList', function() {
+		if(ctrl.contactList && ctrl.contactList.length > 0) {
+			ctrl.setSelectedId(ctrl.contactList[0].uid());
+			ctrl.loading = false;
+			unbindListWatch();
+		}
+	});
+
 	$scope.$watch('ctrl.routeParams.uid', function(newValue) {
 		if(newValue === undefined) {
 			// we might have to wait until ng-repeat filled the contactList