From c7f09f5e866e3d9815aeafecb20188d0c7a281bf Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 2 Nov 2015 11:51:46 -0300 Subject: [PATCH 1/2] Updates addressbook variable only if it is modified --- src/js/controllers/walletHome.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 92781bd2a..10cf92569 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -214,6 +214,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.error = err; return; } + $rootScope.$emit('Local/AddressbookUpdated'); $scope.list = ab; $scope.editAddressbook = true; $scope.toggleEditAddressbook(); @@ -230,6 +231,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.error = err; return; } + $rootScope.$emit('Local/AddressbookUpdated'); $scope.list = ab; $scope.$digest(); }); @@ -272,7 +274,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi modalInstance.result.finally(function() { $rootScope.modalOpened = false; - $rootScope.$emit('Local/AddressbookUpdated'); disableCloseModal(); var m = angular.element(document.getElementsByClassName('reveal-modal')); m.addClass(animationService.modalAnimated.slideOutDown); From 18e5d9f6158028220a1faf6728fa205a845d74e7 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 2 Nov 2015 12:04:18 -0300 Subject: [PATCH 2/2] Improves updating addressbook --- src/js/controllers/index.js | 13 +++++++++---- src/js/controllers/walletHome.js | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 84c4b2fe0..bd3ec1911 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1011,7 +1011,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r }; - self.setAddressbook = function() { + self.setAddressbook = function(ab) { + if (ab) { + self.addressbook = ab; + return; + } + addressbookService.list(function(err, ab) { if (err) { $log.error('Error getting the addressbook'); @@ -1027,8 +1032,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.updateHistory(); }); - $rootScope.$on('Local/AddressbookUpdated', function(event) { - self.setAddressbook(); + $rootScope.$on('Local/AddressbookUpdated', function(event, ab) { + self.setAddressbook(ab); }); // UX event handlers @@ -1286,4 +1291,4 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.setFocusedWallet(); }); }); -}); \ No newline at end of file +}); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 10cf92569..60b9e42b0 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -214,7 +214,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.error = err; return; } - $rootScope.$emit('Local/AddressbookUpdated'); + $rootScope.$emit('Local/AddressbookUpdated', ab); $scope.list = ab; $scope.editAddressbook = true; $scope.toggleEditAddressbook(); @@ -231,7 +231,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.error = err; return; } - $rootScope.$emit('Local/AddressbookUpdated'); + $rootScope.$emit('Local/AddressbookUpdated', ab); $scope.list = ab; $scope.$digest(); });