anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #68 from matiu/bug/fix-loading2

Browse source 
fix create
This commit is contained in:
Manuel Aráoz 2014-04-16 19:20:51 -03:00
commit a5262ef68a
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/controllers/signin.js
View file

@ -14,7 +14,7 @@ angular.module('copay.signin').controller('SigninController',
}; };
var _setupUxHandlers = function(w) { var _setupUxHandlers = function(w) {
w.on('open', function(){ w.on('created', function(){
$location.path('peer'); $location.path('peer');
$rootScope.wallet = w; $rootScope.wallet = w;
$rootScope.$digest(); $rootScope.$digest();

5
js/models/core/Wallet.js
View file

@ -115,16 +115,15 @@ Wallet.prototype._handleNetworkChange = function(newPeer) {
this.sendTxProposals(newPeer); this.sendTxProposals(newPeer);
}; };
Wallet.prototype.netStart = function(cb) { Wallet.prototype.netStart = function() {
var self = this; var self = this;
var net = this.network; var net = this.network;
net.on('networkChange', function() { self._handleNetworkChange() } ); net.on('networkChange', function() { self._handleNetworkChange(); } );
net.on('data', function() { self._handleData();}); net.on('data', function() { self._handleData();});
net.on('open', function() {}); // TODO net.on('open', function() {}); // TODO
net.on('close', function() {}); // TODO net.on('close', function() {}); // TODO
net.start(function(peerId) { net.start(function(peerId) {
self.emit('created'); self.emit('created');
return cb();
}); });
}; };