diff options
Diffstat (limited to 'alias-angular')
| -rw-r--r-- | alias-angular/app/js/controllers.js | 5 | ||||
| -rw-r--r-- | alias-angular/app/js/filters.js | 14 |
2 files changed, 6 insertions, 13 deletions
diff --git a/alias-angular/app/js/controllers.js b/alias-angular/app/js/controllers.js index 144592a..1eb53e7 100644 --- a/alias-angular/app/js/controllers.js +++ b/alias-angular/app/js/controllers.js @@ -35,7 +35,7 @@ function ConnectCtl($scope, StropheSrv, $log, $rootScope) { } ConnectCtl.$inject = ['$scope', 'StropheSrv', '$log', '$rootScope']; - + function RosterCtl($scope, StropheSrv, $log) { $scope.contacts = {}; $scope.get_contacts = function() { @@ -46,7 +46,7 @@ function RosterCtl($scope, StropheSrv, $log) { var query = elems[0]; Strophe.forEachChild(query, 'item', function(item){ var jid = item.getAttribute('jid'); - var name = item.getAttribute('name'); + var name = item.getAttribute('name')||''; //contacts are offline by default $scope.contacts[jid] = {jid: jid, name: name, status: 'offline'}; }); @@ -89,4 +89,3 @@ function RosterCtl($scope, StropheSrv, $log) { } RosterCtl.$inject = ['$scope','StropheSrv','$log']; - diff --git a/alias-angular/app/js/filters.js b/alias-angular/app/js/filters.js index 3321999..6b77998 100644 --- a/alias-angular/app/js/filters.js +++ b/alias-angular/app/js/filters.js @@ -8,16 +8,10 @@ angular.module('Alias.filters', []). return contacts; } else { return _.filter(contacts, function(contact) { - if ( contact.jid.indexOf(query) > -1) { - return true; - } else { - if (_.has(contact, 'name') && - contact.name.indexOf(query) >-1) { - return true; - } else { - return false; - } - } + return (contact.hasOwnProperty('name') && + contact.name.indexOf(query) > -1) || + (contact.jid.indexOf(query) > -1 || + contact.jid.indexOf(query) > -1); }); } }; |