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

fix conflicts

Browse source
This commit is contained in:
Mario Colque 2014-03-31 18:05:35 -03:00
commit 92f4422841
26 changed files with 1811 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

25
js/controllers/signin.js
View file

@ -1,15 +1,28 @@
'use strict';
angular.module('cosign.signin').controller('SigninController',
angular.module('copay.signin').controller('SigninController',
function($scope, $rootScope, $location, Network) {
$scope.loading = false;
$rootScope.peerId = null;
// Init peer
Network.init();
$scope.create = function() {
$scope.loading = true;
Network.init(function(pid) {
$rootScope.masterId = pid;
$location.path('peer');
});
};
$scope.join = function(cid) {
console.log('------- joining to ' + cid + ' --------');
$scope.loading = true;
Network.init(function() {
Network.connect(cid, function() {
$rootScope.masterId = cid;
$location.path('peer');
});
});
var pid = cid || $rootScope.peerId;
$location.path('join/' + pid);
};
});