diff options
| -rw-r--r-- | js/main.js | 1 | ||||
| -rw-r--r-- | js/public/script.js | 42 | ||||
| -rw-r--r-- | js/services/addressBook_service.js | 10 |
3 files changed, 28 insertions, 25 deletions
@@ -64,4 +64,3 @@ app.config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $ur } }); }]); - diff --git a/js/public/script.js b/js/public/script.js index 85a4d36e..be39ffed 100644 --- a/js/public/script.js +++ b/js/public/script.js @@ -65,7 +65,22 @@ app.config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $ur }); }]); - +app.controller('addressbookCtrl', function() { + var ctrl = this; + console.log(this); +}); +app.directive('addressbook', function() { + return { + restrict: 'A', // has to be an attribute to work with core css + scope: {}, + controller: 'addressbookCtrl', + controllerAs: 'ctrl', + bindToController: { + addressBook: "=data" + }, + templateUrl: OC.linkTo('contactsrework', 'templates/addressBook.html') + }; +}); app.controller('addressbooklistCtrl', ['$scope', 'AddressBookService', function(scope, AddressBookService) { var ctrl = this; @@ -133,22 +148,6 @@ app.directive('contactlist', function() { templateUrl: OC.linkTo('contactsrework', 'templates/contactList.html') }; }); -app.controller('addressbookCtrl', function() { - var ctrl = this; - console.log(this); -}); -app.directive('addressbook', function() { - return { - restrict: 'A', // has to be an attribute to work with core css - scope: {}, - controller: 'addressbookCtrl', - controllerAs: 'ctrl', - bindToController: { - addressBook: "=data" - }, - templateUrl: OC.linkTo('contactsrework', 'templates/addressBook.html') - }; -}); app.factory('AddressBook', function() { return function AddressBook(data) { @@ -254,15 +253,18 @@ app.service('AddressBookService', ['DavClient', 'DavService', 'AddressBook', 'Co // parse contacts addressBook.contacts = []; for(var i in addressBook.objects) { - addressBook.contacts.push( - new Contact(addressBook.objects[i]) - ); + if(typeof addressBook.objects[i] === 'object') { + addressBook.contacts.push( + new Contact(addressBook.objects[i]) + ); + } } return addressBook; }); }; }]); + app.service('ContactService', [ 'DavClient', function(DavClient) { this.create = function(addressBook) { diff --git a/js/services/addressBook_service.js b/js/services/addressBook_service.js index 5ea3669a..47aae658 100644 --- a/js/services/addressBook_service.js +++ b/js/services/addressBook_service.js @@ -21,12 +21,14 @@ app.service('AddressBookService', ['DavClient', 'DavService', 'AddressBook', 'Co // parse contacts addressBook.contacts = []; for(var i in addressBook.objects) { - addressBook.contacts.push( - new Contact(addressBook.objects[i]) - ); + if(typeof addressBook.objects[i] === 'object') { + addressBook.contacts.push( + new Contact(addressBook.objects[i]) + ); + } } return addressBook; }); }; -}]);
\ No newline at end of file +}]); |