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

Merge pull request #6338 from gabrielbazan7/fix/defaultTitle 

avoid default title and fixes for buttons translations
This commit is contained in:
Gustavo Maximiliano Cortez 2017-06-30 16:04:34 -03:00 committed by GitHub
parent 6c35bd3250 8c422da435
commit 2626f675ff
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/js/services/popupService.js
View File

@ -7,13 +7,13 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
/*************** Ionic ****************/ /*************** Ionic ****************/
var _ionicAlert = function(title, message, cb, buttonName) { var _ionicAlert = function(title, message, cb, okText) {
if (!cb) cb = function() {}; if (!cb) cb = function() {};
$ionicPopup.alert({ $ionicPopup.alert({
title: title, title: title,
subTitle: message, subTitle: message,
okType: 'button-clear button-positive', okType: 'button-clear button-positive',
okText: buttonName || gettextCatalog.getString('OK'), okText: okText || gettextCatalog.getString('OK'),
}).then(cb); }).then(cb);
}; };
@ -46,9 +46,11 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
/*************** Cordova ****************/ /*************** Cordova ****************/
var _cordovaAlert = function(title, message, cb, buttonName) { var _cordovaAlert = function(title, message, cb, okText) {
if (!cb) cb = function() {}; if (!cb) cb = function() {};
navigator.notification.alert(message, cb, title, buttonName); title = title ? title : '';
okText = okText || gettextCatalog.getString('OK');
navigator.notification.alert(message, cb, title, okText);
}; };
var _cordovaConfirm = function(title, message, okText, cancelText, cb) { var _cordovaConfirm = function(title, message, okText, cancelText, cb) {
@ -58,6 +60,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
} }
okText = okText || gettextCatalog.getString('OK'); okText = okText || gettextCatalog.getString('OK');
cancelText = cancelText || gettextCatalog.getString('Cancel'); cancelText = cancelText || gettextCatalog.getString('Cancel');
title = title ? title : '';
navigator.notification.confirm(message, onConfirm, title, [cancelText, okText]); navigator.notification.confirm(message, onConfirm, title, [cancelText, okText]);
}; };
@ -66,7 +69,10 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
if (results.buttonIndex == 1) return cb(results.input1); if (results.buttonIndex == 1) return cb(results.input1);
else return cb(); else return cb();
} }
navigator.notification.prompt(message, onPrompt, title, null, opts.defaultText); var okText = gettextCatalog.getString('OK');
var cancelText = gettextCatalog.getString('Cancel');
title = title ? title : '';
navigator.notification.prompt(message, onPrompt, title, [cancelText, okText], opts.defaultText);
}; };
/** /**
@ -77,14 +83,14 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
* @param {Callback} Function (optional) * @param {Callback} Function (optional)
*/ */
this.showAlert = function(title, msg, cb, buttonName) { this.showAlert = function(title, msg, cb, okText) {
var message = (msg && msg.message) ? msg.message : msg; var message = (msg && msg.message) ? msg.message : msg;
$log.warn(title ? (title + ': ' + message) : message); $log.warn(title ? (title + ': ' + message) : message);
if (isCordova) if (isCordova)
_cordovaAlert(title, message, cb, buttonName); _cordovaAlert(title, message, cb, okText);
else else
_ionicAlert(title, message, cb, buttonName); _ionicAlert(title, message, cb, okText);
}; };
/** /**