From 361b16d2227f8f00a03d7fadb73462f0281e0b3f Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Sun, 4 Jan 2015 12:30:31 -0300 Subject: [PATCH] reverted to binding to live model objects --- js/controllers/homeWallet.js | 11 +---------- views/homeWallet.html | 10 +++++----- views/includes/copayers.html | 2 +- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/js/controllers/homeWallet.js b/js/controllers/homeWallet.js index b5ab79eb6..c9ac95d22 100644 --- a/js/controllers/homeWallet.js +++ b/js/controllers/homeWallet.js @@ -1,19 +1,10 @@ 'use strict'; -var watching; angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $modal, rateService, notification, txStatus, identityService) { $scope.initHome = function() { $rootScope.title = 'Home'; - if (!watching) { - watching = $rootScope.$watch('wallet', function (w) { - $scope.isShared = w.isShared(); - $scope.requiresMultipleSignatures = w.requiresMultipleSignatures(); - if ($scope.isShared) - $scope.copayers = w.getRegisteredPeerIds(); - }); - } - }; + }; $scope.openTxModal = function(tx) { var ModalInstanceCtrl = function($scope, $modalInstance) { diff --git a/views/homeWallet.html b/views/homeWallet.html index 88ce1f7fb..c7ff79897 100644 --- a/views/homeWallet.html +++ b/views/homeWallet.html @@ -37,8 +37,8 @@
- Personal Wallet - + Personal Wallet + Multisignature wallet [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ] in TESTNET @@ -50,12 +50,12 @@
-
+

Spend proposals

-
+
@@ -73,7 +73,7 @@
-
+
diff --git a/views/includes/copayers.html b/views/includes/copayers.html index 42ec854ce..be22ff6bb 100644 --- a/views/includes/copayers.html +++ b/views/includes/copayers.html @@ -1,5 +1,5 @@
-
+