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

Merge pull request #523 from cmgustavo/bug/open-external-link-03 

Fix open external link (mobile)
This commit is contained in:
Jason Dreyzehner 2016-10-17 20:42:49 -04:00 committed by GitHub
parent d9f99654b5 f0169fdde4
commit b6a2971510
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/js/services/externalLinkService.js
View File

@ -2,6 +2,12 @@
angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService, popupService, gettextCatalog, $window, $log, $timeout) { angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService, popupService, gettextCatalog, $window, $log, $timeout) {
var _restoreHandleOpenURL = function(old) {
$timeout(function() {
$window.handleOpenURL = old;
}, 500);
};
this.open = function(url, optIn, title, message, okText, cancelText) { this.open = function(url, optIn, title, message, okText, cancelText) {
var old = $window.handleOpenURL; var old = $window.handleOpenURL;
@ -10,12 +16,9 @@ angular.module('copayApp.services').service('externalLinkService', function(plat
$log.debug('Skip: ' + url); $log.debug('Skip: ' + url);
}; };
$timeout(function() {
$window.handleOpenURL = old;
}, 500);
if (platformInfo.isNW) { if (platformInfo.isNW) {
nodeWebkitService.openExternalLink(url); nodeWebkitService.openExternalLink(url);
_restoreHandleOpenURL(old);
} else { } else {
if (optIn) { if (optIn) {
var message = gettextCatalog.getString(message), var message = gettextCatalog.getString(message),
@ -24,9 +27,13 @@ angular.module('copayApp.services').service('externalLinkService', function(plat
cancelText = gettextCatalog.getString(cancelText), cancelText = gettextCatalog.getString(cancelText),
openBrowser = function(res) { openBrowser = function(res) {
if (res) window.open(url, '_system'); if (res) window.open(url, '_system');
_restoreHandleOpenURL(old);
}; };
popupService.showConfirm(title, message, okText, cancelText, openBrowser); popupService.showConfirm(title, message, okText, cancelText, openBrowser);
} else window.open(url, '_system'); } else {
window.open(url, '_system');
_restoreHandleOpenURL(old);
}
} }
}; };