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

rebase

Browse source
This commit is contained in:
Javier 2016-06-02 11:09:40 -03:00
commit dd382de0dd
5 changed files with 10 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/controllers/modals/customAmount.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('customAmountController', function($scope, $timeout, $filter, isCordova, isMobile, rateService) {
angular.module('copayApp.controllers').controller('customAmountController', function($scope, $timeout, $filter, platformInfo, rateService) {
var self = $scope.self;
$scope.unitName = self.unitName;
@ -12,7 +12,7 @@ angular.module('copayApp.controllers').controller('customAmountController', func
$scope.unitDecimals = self.unitDecimals;
var satToUnit = 1 / self.unitToSatoshi;
$scope.showAlternative = false;
$scope.isCordova = isCordova;
$scope.isCordova = platformInfo.isCordova;
Object.defineProperty($scope,
"_customAlternative", {
@ -68,8 +68,8 @@ angular.module('copayApp.controllers').controller('customAmountController', func
};
$scope.shareAddress = function(uri) {
if (isCordova) {
if (isMobile.Android() || isMobile.Windows()) {
if (platformInfo.isCordova) {
if (platformInfo.isAndroid || platformInfo.isWP) {
window.ignoreMobilePause = true;
}
window.plugins.socialsharing.share(uri, null, null, null);

4
src/js/controllers/modals/txpDetails.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, txStatus, $ionicScrollDelegate, txFormatService, fingerprintService, bwsError, isChromeApp, gettextCatalog, lodash, profileService, walletService) {
angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, platformInfo, txStatus, $ionicScrollDelegate, txFormatService, fingerprintService, bwsError, gettextCatalog, lodash, profileService, walletService) {
var self = $scope.self;
var tx = $scope.tx;
var copayers = $scope.copayers;
@ -131,7 +131,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
};
function checkPaypro() {
if (tx.payProUrl && !isChromeApp) {
if (tx.payProUrl && !platformInfo.isChromeApp) {
fc.fetchPayPro({
payProUrl: tx.payProUrl,
}, function(err, paypro) {