Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/external_link_open_system_browser

# Conflicts:
#	src/js/services/externalLinkService.js
This commit is contained in:
Jamal Jackson 2016-10-12 13:57:21 -04:00
commit 3d9e40b4c5
10 changed files with 73 additions and 40 deletions

View file

@ -3,6 +3,17 @@
angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService, popupService, gettextCatalog) {
this.open = function(url, optIn, title, desc, okText, cancelText) {
var old = $window.handleOpenURL;
$window.handleOpenURL = function(url) {
// Ignore external URLs
$log.debug('Skip: ' + url);
};
$timeout(function() {
$window.handleOpenURL = old;
}, 500);
if (platformInfo.isNW) {
nodeWebkitService.openExternalLink(url);
} else {