From 6fea0a4f6a7abbe5ff1bb4178182f9cb61be666d Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Fri, 16 May 2014 18:48:17 -0300 Subject: [PATCH] fix signin --- js/controllers/footer.js | 3 --- js/controllers/signin.js | 1 - js/models/core/Wallet.js | 2 ++ js/services/controllerUtils.js | 5 ++--- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/js/controllers/footer.js b/js/controllers/footer.js index e84d784f7..7fe81808d 100644 --- a/js/controllers/footer.js +++ b/js/controllers/footer.js @@ -18,8 +18,6 @@ angular.module('copay.footer').controller('FooterController', function($rootScop $scope.getVideoURL = function(copayer) { var vi = $rootScope.videoInfo[copayer] - -console.log('[footer.js.21]', vi); //TODO if (!vi) return; if ($rootScope.wallet.getOnlinePeerIDs().indexOf(copayer) === -1) { @@ -31,7 +29,6 @@ console.log('[footer.js.21]', vi); //TODO var encoded = vi.url; var url = decodeURI(encoded); var trusted = $sce.trustAsResourceUrl(url); -console.log('[footer.js.31:trusted:]',trusted); //TODO return trusted; }; }); diff --git a/js/controllers/signin.js b/js/controllers/signin.js index a08395d1f..f05202b42 100644 --- a/js/controllers/signin.js +++ b/js/controllers/signin.js @@ -85,7 +85,6 @@ angular.module('copay.signin').controller('SigninController', $scope.failure = true; }); wallet.on('ready', function() { - console.log('## RECEIVED READY2'); $scope.loading = false; }); } diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index 24988dc39..9a2e07b24 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -225,7 +225,9 @@ Wallet.prototype.netStart = function() { net.start(startOpts, function() { self.emit('ready', net.getPeer()); setTimeout(function(){ +console.log('[EMIT publicKeyRingUpdated:]'); //TODO self.emit('publicKeyRingUpdated'); +console.log('[CONNECT:]'); //TODO self.connectToAll(); self.emit('txProposalsUpdated'); },10); diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js index f18972911..a176b4191 100644 --- a/js/services/controllerUtils.js +++ b/js/services/controllerUtils.js @@ -55,12 +55,11 @@ angular.module('copay.controllerUtils') }; }); w.on('ready', function(myPeerID) { - console.log('## RECEIVED READY.'); - video.setOwnPeer(myPeerID, w, handlePeerVideo); $rootScope.wallet = w; $location.path('addresses'); - $rootScope.$digest(); + video.setOwnPeer(myPeerID, w, handlePeerVideo); }); + w.on('publicKeyRingUpdated', function() { root.setSocketHandlers(); root.updateAddressList();