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

Merge pull request #2115 from cmgustavo/bug/mobile-20 

Bug/mobile 20
This commit is contained in:
Matias Alejo Garcia 2014-12-11 21:31:07 -03:00
parent 597c795134 c15ec58643
commit 8d2f24ceb5
5 changed files with 74 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
index.html
View File

@ -22,6 +22,7 @@
</head>
<body
ng-controller="IndexController"
ng-swipe-disable-mouse
ng-swipe-left="swipe()"
ng-swipe-right="swipe(true)">

91
js/controllers/homeWallet.js
View File

@ -6,69 +6,66 @@ angular.module('copayApp.controllers').controller('HomeWalletController', functi
var w = $rootScope.wallet;
if (w.isShared())
$scope.copayers = w.getRegisteredPeerIds();
};
};
$scope.sign = function(ntxid) {
var w = $rootScope.wallet;
$scope.loading = true;
$scope.error = $scope.success = null;
w.signAndSend(ntxid, function(err, id, status) {
$scope.loading = false;
if (err)
$scope.error = err;
else
txStatus.notify(status);
});
};
$scope.reject = function(ntxid) {
var w = $rootScope.wallet;
w.reject(ntxid, function(err, status) {
if (err)
$scope.error = err;
else
txStatus.notify(status);
});
};
$scope.broadcast = function(ntxid) {
var w = $rootScope.wallet;
$scope.error = $scope.success = null;
$scope.loading = true;
w.issueTx(ntxid, function(err, txid, status) {
$scope.loading = false;
if (err)
$scope.error = err;
txStatus.notify(status);
});
};
var $outScope = $scope;
$scope.openTxModal = function(tx) {
var ModalInstanceCtrl = function($scope, $modalInstance) {
var w = $rootScope.wallet;
$scope.tx = tx;
$scope.loading = null;
$scope.sign = function(ntxid) {
$outScope.sign(ntxid);
$modalInstance.dismiss('cancel');
$scope.loading = true;
$timeout(function() {
w.signAndSend(ntxid, function(err, id, status) {
$scope.loading = false;
if (err)
$scope.error = err;
else
$modalInstance.close(status);
});
}, 100);
};
$scope.reject = function(ntxid) {
$outScope.reject(ntxid);
$modalInstance.dismiss('cancel');
$scope.loading = true;
$timeout(function() {
w.reject(ntxid, function(err, status) {
$scope.loading = false;
if (err)
$scope.error = err;
else
$modalInstance.close(status);
});
}, 100);
};
$scope.broadcast = function(ntxid) {
$scope.loading = true;
$timeout(function() {
w.issueTx(ntxid, function(err, txid, status) {
$scope.loading = false;
if (err)
$scope.error = err;
$modalInstance.close(status);
});
}, 100);
};
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
};
};
$modal.open({
var modalInstance = $modal.open({
templateUrl: 'views/modals/txp-details.html',
windowClass: 'medium',
controller: ModalInstanceCtrl,
});
modalInstance.result.then(function(status) {
txStatus.notify(status);
});
};
});

4
js/controllers/index.js
View File

@ -6,9 +6,7 @@ angular.module('copayApp.controllers').controller('IndexController', function($s
};
$scope.swipe = function(invert) {
if (isCordova) {
go.swipe(invert);
}
go.swipe(invert);
};
});

5
views/modals/tx-status.html
View File

@ -1,9 +1,12 @@
<div class="m20tp">
<div class="text-center size-72 m10v">
<div class="text-primary">
<div ng-show="statusStr !== 'Transaction was rejected'" class="text-primary">
<i class="fi-check"></i>
</div>
<div ng-show="statusStr === 'Transaction was rejected'" class="text-warning">
<i class="fi-x"></i>
</div>
</div>

29
views/modals/txp-details.html
View File

@ -58,16 +58,35 @@
</li>
</ul>
</div>
</div>
<div class="row collapse" ng-show="!tx.signedBy[$root.wallet.getMyCopayerId()] && !tx.rejectedBy[$root.wallet.getMyCopayerId()]">
<div class="box-notification" ng-show="error">
<div class="box-icon error">
<i class="fi-x size-24"></i>
</div>
<span class="text-warning size-14">
{{error}}
</span>
<a class="close-notification text-warning" ng-click="error=null">&#215;</a>
</div>
<div class="row collapse"
ng-init="hideSign = false; hideReject = false"
ng-show="!tx.signedBy[$root.wallet.getMyCopayerId()] && !tx.rejectedBy[$root.wallet.getMyCopayerId()]">
<div class="large-6 medium-6 small-6 columns">
<button class="button warning m0" ng-click="reject(tx.ntxid)" ng-disabled="loading">
<i class="fi-x icon-sign x"></i> <span translate>Reject</span>
<button class="button warning m0" ng-click="hideSign = true; reject(tx.ntxid);"
ng-disabled="loading" ng-show="!hideReject">
<i class="fi-x icon-sign x" ng-show="!loading"></i>
<i class="fi-bitcoin-circle icon-rotate spinner" ng-show="loading"></i>
<span translate>Reject</span>
</button>
</div>
<div class="large-6 medium-6 small-6 columns text-right">
<button class="button primary m0" ng-click="sign(tx.ntxid)" ng-disabled="loading">
<i class="fi-check icon-sign check"></i> <span translate>Sign</span>
<button class="button primary m0" ng-click="hideReject = true; sign(tx.ntxid)"
ng-disabled="loading" ng-show="!hideSign">
<i class="fi-check icon-sign check" ng-show="!loading"></i>
<i class="fi-bitcoin-circle icon-rotate spinner" ng-show="loading"></i>
<span translate>Sign</span>
</button>
</div>
</div>