mirror of https://github.com/BTCPrivate/copay.git
Replace iframe for window.open _blank
This commit is contained in:
parent
f1a2b357db
commit
d484c5ab49
|
@ -183,7 +183,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<iframe ng-src="{{mobileBackupURI}}" style="width: 0px; height: 0px; margin:0px; border: 0px"></iframe>
|
|
||||||
<div id="footer" data-ng-controller="FooterController" ng-class="{'footer-home': !$root.wallet || !$root.wallet.isReady()}">
|
<div id="footer" data-ng-controller="FooterController" ng-class="{'footer-home': !$root.wallet || !$root.wallet.isReady()}">
|
||||||
<link rel="stylesheet" ng-href="{{theme}}">
|
<link rel="stylesheet" ng-href="{{theme}}">
|
||||||
<div ng-show="!$root.wallet">
|
<div ng-show="!$root.wallet">
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
angular.module('copayApp.controllers').controller('BackupController',
|
angular.module('copayApp.controllers').controller('BackupController',
|
||||||
function($scope, $rootScope, backupService, walletFactory, controllerUtils) {
|
function($scope, $rootScope, backupService, walletFactory, controllerUtils) {
|
||||||
$scope.download = function() {
|
$scope.download = function() {
|
||||||
backupService.download($rootScope.wallet, $rootScope);
|
backupService.download($rootScope.wallet);
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.deleteWallet = function() {
|
$scope.deleteWallet = function() {
|
||||||
|
|
|
@ -90,12 +90,12 @@ angular.module('copayApp.controllers').controller('HeaderController',
|
||||||
$scope.backup = function() {
|
$scope.backup = function() {
|
||||||
var w = $rootScope.wallet;
|
var w = $rootScope.wallet;
|
||||||
w.setBackupReady();
|
w.setBackupReady();
|
||||||
backupService.download(w, $rootScope);
|
backupService.download(w);
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.dowloadBackup = function() {
|
$scope.dowloadBackup = function() {
|
||||||
var w = $rootScope.wallet;
|
var w = $rootScope.wallet;
|
||||||
backupService.download(w, $rootScope);
|
backupService.download(w);
|
||||||
}
|
}
|
||||||
|
|
||||||
$scope.getVideoURL = function(copayer) {
|
$scope.getVideoURL = function(copayer) {
|
||||||
|
|
|
@ -9,7 +9,7 @@ BackupService.prototype.getName = function(wallet) {
|
||||||
return (wallet.name ? (wallet.name + '-') : '') + wallet.id;
|
return (wallet.name ? (wallet.name + '-') : '') + wallet.id;
|
||||||
};
|
};
|
||||||
|
|
||||||
BackupService.prototype.download = function(wallet, scope) {
|
BackupService.prototype.download = function(wallet) {
|
||||||
var ew = wallet.toEncryptedObj();
|
var ew = wallet.toEncryptedObj();
|
||||||
var partial = !wallet.publicKeyRing.isComplete();
|
var partial = !wallet.publicKeyRing.isComplete();
|
||||||
var walletName = this.getName(wallet) + (partial ? '-Partial' : '');
|
var walletName = this.getName(wallet) + (partial ? '-Partial' : '');
|
||||||
|
@ -30,13 +30,13 @@ BackupService.prototype.download = function(wallet, scope) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// throw an email intent if we are in the mobile version
|
// throw an email intent if we are in the mobile version
|
||||||
if (window.xwalk && scope) {
|
if (window.xwalk) {
|
||||||
var name = wallet.name ? wallet.name + ' ' : '';
|
var name = wallet.name ? wallet.name + ' ' : '';
|
||||||
var partial = partial ? 'Partial ' : '';
|
var partial = partial ? 'Partial ' : '';
|
||||||
var subject = 'Copay - ' + name + 'Wallet ' + partial + 'Backup';
|
var subject = 'Copay - ' + name + 'Wallet ' + partial + 'Backup';
|
||||||
var body = 'This is the encrypted backup of the wallet ' + wallet.id + ':\n\n' + ew;
|
var body = 'This is the encrypted backup of the wallet ' + wallet.id + ':\n\n' + ew;
|
||||||
scope.mobileBackupURI = encodeURI('mailto:?subject=' + subject + '&body=' + body);
|
var mailURL = encodeURI('mailto:?subject=' + subject + '&body=' + body);
|
||||||
return;
|
return window.open(mailURL,'_blank');
|
||||||
}
|
}
|
||||||
|
|
||||||
// otherwise lean on the browser implementation
|
// otherwise lean on the browser implementation
|
||||||
|
|
Loading…
Reference in New Issue