From 132920f90969561fa4cfbf05b79ffe9b1c981d22 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Fri, 9 May 2014 12:14:57 -0300 Subject: [PATCH] change wallet event 'create' to 'ready' --- js/models/core/Wallet.js | 2 +- js/services/controllerUtils.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index b6b38b233..d60828c81 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -205,7 +205,7 @@ Wallet.prototype.netStart = function() { net.start(startOpts, function() { self.connectToAll(); - self.emit('created', net.getPeer()); + self.emit('ready', net.getPeer()); self.emit('refresh'); }); }; diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js index d52110cc5..f155de2c5 100644 --- a/js/services/controllerUtils.js +++ b/js/services/controllerUtils.js @@ -74,10 +74,11 @@ angular.module('copay.controllerUtils') message: 'Received wrong message from peer id:' + peerId }; }); - w.on('created', function(myPeerID) { + w.on('ready', function(myPeerID) { video.setOwnPeer(myPeerID, w, handlePeerVideo); $rootScope.wallet = w; $location.path('addresses'); + $rootScope.$digest(); }); w.on('refresh', function() { //alert('refresh'); @@ -93,6 +94,7 @@ angular.module('copay.controllerUtils') }); w.on('openError', root.onErrorDigest); w.on('peer', function(peerID) { + //alert('peer'); video.callPeer(peerID, handlePeerVideo); $rootScope.$digest(); });