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

Merge branch 'master' into feature/05-new-design

Browse source 
Conflicts:
	js/services/video.js
This commit is contained in:
Gustavo Cortez 2014-04-30 16:14:36 -03:00
commit e24a88dca1
15 changed files with 217 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

28
js/controllers/signin.js
View file

@ -19,24 +19,26 @@ angular.module('copay.signin').controller('SigninController',
};
$scope.join = function(secret) {
if (!secret || secret.length !==66 || !secret.match(/^[0-9a-f]*$/) ) {
$rootScope.flashMessage = { message: 'Bad secret secret string', type: 'error'};
return;
}
$scope.loading = true;
walletFactory.network.on('joinError', function() {
controllerUtils.onErrorDigest($scope);
walletFactory.network.on('badSecret', function() {
});
walletFactory.joinCreateSession(secret, function(w) {
if (w) {
controllerUtils.startNetwork(w);
}
else {
$scope.loading = false;
controllerUtils.onErrorDigest();
walletFactory.joinCreateSession(secret, function(err,w) {
$scope.loading = false;
console.log('[signin.js.27:err:]',err,w); //TODO
if (err || !w) {
if (err === 'joinError')
$rootScope.flashMessage = { message: 'Can not find peer'};
else if (err === 'badSecret')
$rootScope.flashMessage = { message: 'Bad secret secret string', type: 'error'};
else
$rootScope.flashMessage = { message: 'Unknown error', type: 'error'};
controllerUtils.onErrorDigest();
}
else
controllerUtils.startNetwork(w);
});
};
});