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

fix rebase problem

Browse source
This commit is contained in:
Gabriel Bazán 2015-11-11 18:54:41 -03:00
commit 3ae7b314d5
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
public/views/export.html
View file

@ -45,6 +45,14 @@
</form> </form>
<h4></h4> <h4></h4>
<ul class="no-bullet m0">
<li>
<switch id="no-metaData" name="metaData" ng-model="metaData" class="green right"></switch>
<span translate>Include address book and history cache</span>
</li>
</ul>
<ul class="no-bullet m0" ng-show="index.canSign"> <ul class="no-bullet m0" ng-show="index.canSign">
<li> <li>
<switch id="no-sign" name="noSign" ng-model="noSign" class="green right"></switch> <switch id="no-sign" name="noSign" ng-model="noSign" class="green right"></switch>

11
src/js/controllers/export.js
View file

@ -6,12 +6,12 @@ angular.module('copayApp.controllers').controller('backupController',
self.error = null; self.error = null;
self.success = null; self.success = null;
$scope.metaData = true;
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
self.isEncrypted = fc.isPrivKeyEncrypted(); self.isEncrypted = fc.isPrivKeyEncrypted();
self.downloadWalletBackup = function() { self.downloadWalletBackup = function() {
self.getMetaData(function(err, txsFromLocal, localAddressBook) { self.getMetaData($scope.metaData, function(err, txsFromLocal, localAddressBook) {
if (err) { if (err) {
self.error = true; self.error = true;
return; return;
@ -28,14 +28,14 @@ angular.module('copayApp.controllers').controller('backupController',
return; return;
} }
$rootScope.$emit('Local/BackupDone');
notification.success(gettext('Success'), gettext('Encrypted export file saved')); notification.success(gettext('Success'), gettext('Encrypted export file saved'));
go.walletHome(); go.walletHome();
}); });
}); });
}; };
self.getMetaData = function(cb) { self.getMetaData = function(metaData, cb) {
if (metaData == false) return cb();
self.getHistoryCache(function(err, txsFromLocal) { self.getHistoryCache(function(err, txsFromLocal) {
if (err) return cb(err); if (err) return cb(err);
@ -108,7 +108,6 @@ angular.module('copayApp.controllers').controller('backupController',
var ew = backup; var ew = backup;
if (!ew) return; if (!ew) return;
self.backupWalletPlainText = ew; self.backupWalletPlainText = ew;
$rootScope.$emit('Local/BackupDone');
}); });
}, 100); }, 100);
}; };
@ -119,7 +118,6 @@ angular.module('copayApp.controllers').controller('backupController',
if (!ew) return; if (!ew) return;
window.cordova.plugins.clipboard.copy(ew); window.cordova.plugins.clipboard.copy(ew);
window.plugins.toast.showShortCenter(gettextCatalog.getString('Copied to clipboard')); window.plugins.toast.showShortCenter(gettextCatalog.getString('Copied to clipboard'));
$rootScope.$emit('Local/BackupDone');
}); });
}; };
@ -145,7 +143,6 @@ angular.module('copayApp.controllers').controller('backupController',
body: 'Here is the encrypted backup of the wallet ' + name + ': \n\n' + ew + '\n\n To import this backup, copy all text between {...}, including the symbols {}', body: 'Here is the encrypted backup of the wallet ' + name + ': \n\n' + ew + '\n\n To import this backup, copy all text between {...}, including the symbols {}',
isHtml: false isHtml: false
}; };
$rootScope.$emit('Local/BackupDone');
window.plugin.email.open(properties); window.plugin.email.open(properties);
}); });
}; };