diff options
Diffstat (limited to 'js/components/contactDetails/contactDetails_controller.js')
-rw-r--r-- | js/components/contactDetails/contactDetails_controller.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/js/components/contactDetails/contactDetails_controller.js b/js/components/contactDetails/contactDetails_controller.js index ca64648d..333c2927 100644 --- a/js/components/contactDetails/contactDetails_controller.js +++ b/js/components/contactDetails/contactDetails_controller.js @@ -3,7 +3,8 @@ angular.module('contactsApp') var ctrl = this; - ctrl.loading = true; + ctrl.init = true; + ctrl.loading = false; ctrl.show = false; ctrl.clearContact = function() { @@ -21,11 +22,12 @@ angular.module('contactsApp') placeholderName : t('contacts', 'Name'), placeholderOrg : t('contacts', 'Organization'), placeholderTitle : t('contacts', 'Title'), - selectField : t('contacts', 'Add field ...'), + selectField : t('contacts', 'Add field …'), download : t('contacts', 'Download'), delete : t('contacts', 'Delete'), save : t('contacts', 'Save changes'), - addressBook : t('contacts', 'Address book') + addressBook : t('contacts', 'Address book'), + loading : t('contacts', 'Loading contacts …') }; ctrl.fieldDefinitions = vCardPropertiesService.fieldDefinitions; @@ -41,7 +43,7 @@ angular.module('contactsApp') return book.displayName === ctrl.contact.addressBookId; }); } - ctrl.loading = false; + ctrl.init = false; // Start watching for ctrl.uid when we have addressBooks, as they are needed for fetching // full details. $scope.$watch('ctrl.uid', function(newValue) { @@ -56,6 +58,7 @@ angular.module('contactsApp') $('#app-navigation-toggle').removeClass('showdetails'); return; } + ctrl.loading = true; ContactService.getById(ctrl.addressBooks, uid).then(function(contact) { if (angular.isUndefined(contact)) { ctrl.clearContact(); @@ -63,6 +66,7 @@ angular.module('contactsApp') } ctrl.contact = contact; ctrl.show = true; + ctrl.loading = false; $('#app-navigation-toggle').addClass('showdetails'); ctrl.addressBook = _.find(ctrl.addressBooks, function(book) { |