Fixed socke-emit-on

Merge branch 'master' into feature/socket-io-support

Fix conflicts:
	js/controllers/home.js
This commit is contained in:
Gustavo Cortez 2014-04-17 11:11:17 -03:00
commit 9fdb04e868
4 changed files with 21 additions and 11 deletions

View file

@ -7,9 +7,9 @@ angular.module('copay.peer').controller('PeerController',
//Network.connect($rootScope.masterId);
};
var addrs = $rootScope.wallet.getAddressesStr();
var socket = Socket($scope);
socket.on('connect', function() {
var addrs = $rootScope.wallet.getAddressesStr();
socket.emit('subscribe', 'inv');
for(var i=0;i<addrs.length;i++) {
socket.emit('subscribe', addrs[i]);