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

fixes in networking

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-20 12:41:28 -03:00
commit 6e07d64832
8 changed files with 87 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

22
js/controllers/signin.js
View file

@ -1,6 +1,3 @@
'use strict';
angular.module('copay.signin').controller('SigninController',
function($scope, $rootScope, $location, walletFactory, controllerUtils) {
@ -20,22 +17,29 @@ angular.module('copay.signin').controller('SigninController',
$scope.open = function(walletId, opts) {
$scope.loading = true;
console.log('[signin.js.23:walletId:]',walletId); //TODO
var w = walletFactory.open(walletId, opts);
controllerUtils.setupUxHandlers(w);
w.netStart();
};
$scope.join = function(cid) {
$scope.join = function(secret) {
$scope.loading = true;
walletFactory.network.on('openError', function() {
controllerUtils.onError($scope);
$rootScope.$digest();
walletFactory.network.on('joinError', function() {
controllerUtils.onErrorDigest($scope);
});
walletFactory.connectTo(cid, function(data) {
$scope.open(data.walletId, data.opts);
walletFactory.joinCreateSession(secret, function(w) {
console.log('[signin.js.33] joinCreateSession RETURN', w); //TODO
controllerUtils.setupUxHandlers(w);
w.setupNetHandlers();
});
};
//
// if (cid) {
// var w = walletFactory.(walletId);