fix signin

This commit is contained in:
Matias Alejo Garcia 2014-05-16 18:48:17 -03:00
parent 398daf3f05
commit 6fea0a4f6a
4 changed files with 4 additions and 7 deletions

View File

@ -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;
};
});

View File

@ -85,7 +85,6 @@ angular.module('copay.signin').controller('SigninController',
$scope.failure = true;
});
wallet.on('ready', function() {
console.log('## RECEIVED READY2');
$scope.loading = false;
});
}

View File

@ -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);

View File

@ -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();