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

Fix alert messages

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-07-29 12:37:51 -03:00
commit f69e980d71
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
4 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/controllers/copayers.js
View file

@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('copayersController',
var self = this;
var delete_msg = gettextCatalog.getString('Are you sure you want to delete this wallet?');
var ok_msg = gettextCatalog.getString('OK');
var accept_msg = gettextCatalog.getString('Accept');
var cancel_msg = gettextCatalog.getString('Cancel');
var confirm_msg = gettextCatalog.getString('Confirm');
@ -27,7 +27,7 @@ angular.module('copayApp.controllers').controller('copayersController',
$scope.ok = function() {
$scope.loading = true;
$modalInstance.close(ok_msg);
$modalInstance.close(accept_msg);
};
$scope.cancel = function() {
@ -76,11 +76,11 @@ angular.module('copayApp.controllers').controller('copayersController',
navigator.notification.confirm(
delete_msg,
function(buttonIndex) {
if (buttonIndex == 2) {
if (buttonIndex == 1) {
_deleteWallet();
}
},
confirm_msg, [cancel_msg, ok_msg]
confirm_msg, [accept_msg, cancel_msg]
);
} else {
_modalDeleteWallet();
@ -104,4 +104,4 @@ angular.module('copayApp.controllers').controller('copayersController',
}
};
});
});

10
src/js/controllers/preferencesDelete.js
View file

@ -6,7 +6,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
this.error = null;
var delete_msg = gettextCatalog.getString('Are you sure you want to delete this wallet?');
var ok_msg = gettextCatalog.getString('OK');
var accept_msg = gettextCatalog.getString('Accept');
var cancel_msg = gettextCatalog.getString('Cancel');
var confirm_msg = gettextCatalog.getString('Confirm');
@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
$scope.ok = function() {
$scope.loading = true;
$modalInstance.close(ok_msg);
$modalInstance.close(accept_msg);
};
$scope.cancel = function() {
@ -57,14 +57,14 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
navigator.notification.confirm(
delete_msg,
function(buttonIndex) {
if (buttonIndex == 2) {
if (buttonIndex == 1) {
_deleteWallet();
}
},
confirm_msg, [cancel_msg, ok_msg]
confirm_msg, [accept_msg, cancel_msg]
);
} else {
_modalDeleteWallet();
}
};
});
});

9
src/js/controllers/walletHome.js
View file

@ -89,6 +89,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$rootScope.$digest();
});
var accept_msg = gettextCatalog.getString('Accept');
var cancel_msg = gettextCatalog.getString('Cancel');
var confirm_msg = gettextCatalog.getString('Confirm');
// walletHome
@ -1072,7 +1076,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
};
this.confirmDialog = function(msg, cb) {
if (isCordova) {
if (isCordova) {
navigator.notification.confirm(
msg,
function(buttonIndex) {
@ -1083,7 +1087,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
} else {
return cb(false);
}
}
},
confirm_msg, [accept_msg, cancel_msg]
);
} else if (isChromeApp) {
// No feedback, alert/confirm not supported.