BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Skip avoid waiting for other copayers

This commit is contained in:
Matias Pando 2014-09-12 13:29:41 -03:00
parent b7373367a1 6703652ea9
commit 873f854eb8
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/controllers/copayers.js
View File

@ -8,7 +8,11 @@ angular.module('copayApp.controllers').controller('CopayersController',
$scope.skipBackup = function() { $scope.skipBackup = function() {
var w = $rootScope.wallet; var w = $rootScope.wallet;
<<<<<<< HEAD
w.setBackupReady(true); w.setBackupReady(true);
=======
w.setBackupReady();
>>>>>>> 6703652ea9d7e9e8c9a137a735b2fc2fc6de2494
}; };
$scope.backup = function() { $scope.backup = function() {

6
js/models/core/Wallet.js
View File

@ -89,6 +89,7 @@ function Wallet(opts) {
//to avoid confirmation of copayer's backups if is imported from a file //to avoid confirmation of copayer's backups if is imported from a file
this.isImported = opts.isImported || false; this.isImported = opts.isImported || false;
//to avoid waiting others copayers to make a backup and login immediatly //to avoid waiting others copayers to make a backup and login immediatly
this.forcedLogin = opts.forcedLogin || false; this.forcedLogin = opts.forcedLogin || false;
@ -2432,8 +2433,9 @@ Wallet.prototype.isShared = function() {
* @desc Returns true if the keyring is complete and all users have backed up the wallet * @desc Returns true if the keyring is complete and all users have backed up the wallet
* @return {boolean} * @return {boolean}
*/ */
Wallet.prototype.isReady = function() { Wallet.prototype.isReady = function() { << << << < HEAD
var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported || this.forcedLogin); var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported || this.forcedLogin); === === =
var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported); >>> >>> > 6703652ea9d7e9e8c9a137a735b2fc2fc6de2494
return ret; return ret;
}; };