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

Merge pull request #77 from matiu/bug/fix-uxrefresh

Browse source 
fix uxrefresh with new #setup - awesome!!
This commit is contained in:
Gustavo Maximiliano Cortez 2014-04-17 11:49:02 -03:00
commit 73d5266a89
8 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,6 +120,7 @@ Wallet.prototype._handleNetworkChange = function(newPeer) {
this.sendWalletId(newPeer);
this.sendPublicKeyRing(newPeer);
this.sendTxProposals(newPeer);
this.emit('refresh');
};
Wallet.prototype.netStart = function() {

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

@ -148,7 +148,10 @@ WalletFactory.prototype.openRemote = function(peedId) {
opts.storage = this.storage;
opts.network = this.network;
opts.blockchain = this.blockchain;
opts.spendUnconfirmed = opts.spendUnconfirmed || this.walletDefaults.spendUnconfirmed;
opts.spendUnconfirmed = typeof opts.spendUnconfirmed === undefined
?this.walletDefaults.spendUnconfirmed : opts.spendUnconfirmed;
opts.requiredCopayers = requiredCopayers;
opts.totalCopayers = totalCopayers;
var w = new Wallet(opts);

18
js/models/network/WebRTC.js
View file

@ -61,14 +61,9 @@ Network._arrayRemove = function(el, array) {
return array;
};
// DEBUG
Network.prototype._showConnectedPeers = function() {
// console.log("### CONNECTED PEERS", this.connectedPeers);
};
Network.prototype._onClose = function(peerId) {
this.connectedPeers = Network._arrayRemove(peerId, this.connectedPeers);
this._notify();
this._notifyNetworkChange();
};
Network.prototype._connectToPeers = function(peerIds) {
@ -97,7 +92,7 @@ Network.prototype._onData = function(data, isInbound) {
switch(obj.data.type) {
case 'peerList':
this._connectToPeers(obj.data.peers);
this._notify();
this._notifyNetworkChange();
break;
case 'disconnect':
this._onClose(obj.sender);
@ -144,7 +139,7 @@ Network.prototype._setupConnectionHandlers = function(dataConn, isInbound) {
dataConn.peer, isInbound);
self._addPeer(dataConn.peer, isInbound);
self._notify( isInbound ? dataConn.peer : null);
self._notifyNetworkChange( isInbound ? dataConn.peer : null);
this.emit('open');
}
});
@ -166,8 +161,8 @@ Network.prototype._setupConnectionHandlers = function(dataConn, isInbound) {
});
};
Network.prototype._notify = function(newPeer) {
this._showConnectedPeers();
Network.prototype._notifyNetworkChange = function(newPeer) {
console.log('[WebRTC.js.164:_notifyNetworkChange:]', newPeer); //TODO
this.emit('networkChange', newPeer);
};
@ -178,7 +173,7 @@ Network.prototype._setupPeerHandlers = function(openCallback) {
p.on('open', function(peerId) {
self.peerId = peerId;
self.connectedPeers = [peerId];
self._notify();
self._notifyNetworkChange();
return openCallback(peerId);
});
@ -263,7 +258,6 @@ Network.prototype.connectTo = function(peerId) {
console.log('### STARTING TO CONNECT TO:' + peerId );
var dataConn = this.peer.connect(peerId, {
// label: 'wallet',
serialization: 'none',
reliable: true,
metadata: { message: 'hi copayer!' }