diff --git a/src/js/controllers/glidera.js b/src/js/controllers/glidera.js index 9f701e984..9250de9f1 100644 --- a/src/js/controllers/glidera.js +++ b/src/js/controllers/glidera.js @@ -6,7 +6,7 @@ angular.module('copayApp.controllers').controller('glideraController', $scope.network = glideraService.getEnvironment(); $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + externalLinkService.open(url); }; var initGlidera = function(accessToken) { @@ -27,7 +27,9 @@ angular.module('copayApp.controllers').controller('glideraController', } $scope.token = glidera.token; $scope.permissions = glidera.permissions; - $scope.update({fullUpdate: true}); + $scope.update({ + fullUpdate: true + }); }); }; @@ -113,7 +115,7 @@ angular.module('copayApp.controllers').controller('glideraController', }); }; - $scope.$on("$ionicView.beforeEnter", function(event, data){ + $scope.$on("$ionicView.beforeEnter", function(event, data) { initGlidera(); }); diff --git a/src/js/routes.js b/src/js/routes.js index ed29cd0a0..ff3073659 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -971,8 +971,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr if (lodash.isEmpty(profileService.getWallets())) { $log.debug('No wallets and no disclaimer... redirecting'); $state.go('onboarding.welcome'); - } - else { + } else { $log.debug('Display disclaimer... redirecting'); $state.go('onboarding.disclaimer', { resume: true @@ -981,8 +980,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } else { throw new Error(err); // TODO } - } - else { + } else { profileService.storeProfileIfDirty(); $log.debug('Profile loaded ... Starting UX.'); scannerService.gentleInitialize(); diff --git a/src/js/services/externalLinkService.js b/src/js/services/externalLinkService.js index aa1951fd6..58e5dba54 100644 --- a/src/js/services/externalLinkService.js +++ b/src/js/services/externalLinkService.js @@ -1,13 +1,17 @@ 'use strict'; -angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService) { +angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService, popupService, gettextCatalog) { - this.open = function(url, target) { + this.open = function(url, desc) { if (platformInfo.isNW) { nodeWebkitService.openExternalLink(url); } else { - target = target || '_blank'; - var ref = window.open(url, target, 'location=no'); + desc = desc || 'this link'; + var message = gettextCatalog.getString('You are leaving to view ' + desc + ''), + openBrowser = function(res) { + if (res) window.open(url, '_system'); + }; + popupService.showConfirm('Opening Browser', message, 'Open', 'Cancel', openBrowser); } }; diff --git a/www/views/amazon.html b/www/views/amazon.html index ad3350ac0..f5499dabb 100644 --- a/www/views/amazon.html +++ b/www/views/amazon.html @@ -24,7 +24,7 @@
If you have questions about redeeming your gift card, please visit - www.amazon.com/gc-redeem. + www.amazon.com/gc-redeem. If you have questions regarding the BitPay Introductory offer, please contact BitPay.
@@ -139,14 +139,14 @@Connect your Glidera account to get started
If you have questions about redeeming your gift card, please visit - www.amazon.com/gc-redeem. + www.amazon.com/gc-redeem. If you have questions regarding the BitPay Introductory offer, please contact BitPay.
@@ -81,13 +81,13 @@I have read, understood, and agree with the Terms of use.
diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index b5a118a29..51ca318bd 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -70,7 +70,7 @@All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at - https://crowdin.com/project/copay. + https://crowdin.com/project/copay.
Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 5314a2714..c634c1ef8 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -90,7 +90,7 @@