Fix Conflicts:

index.html
This commit is contained in:
Gustavo Cortez 2014-06-02 22:19:15 -03:00
commit 7aebf032ef
16 changed files with 225 additions and 165 deletions

View file

@ -23,17 +23,15 @@ angular.module('copay.signin').controller('SigninController',
console.log('## Obtaining passphrase...');
Passphrase.getBase64Async(password, function(passphrase){
console.log('## Done.');
console.log('## Passphrase obtained');
var w = walletFactory.open($scope.selectedWalletId, { passphrase: passphrase});
if (!w) {
$scope.loading = $scope.failure = false;
$rootScope.$flashMessage = { message: 'Bad password or connection error', type: 'error'};
$rootScope.$flashMessage = { message: 'Wrong password', type: 'error'};
$rootScope.$digest();
return;
}
console.log('[signin.js.49]'); //TODO
installStartupHandlers(w);
console.log('[signin.js.52]'); //TODO
controllerUtils.startNetwork(w);
});
};