From c4ce8b8b8d0536d35ea48151c5f4717204b950db Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 11 Jan 2016 16:46:50 -0300 Subject: [PATCH] Fix Glidera resume event in the 2FA step --- src/js/controllers/buyGlidera.js | 2 ++ src/js/controllers/glidera.js | 2 ++ src/js/controllers/sellGlidera.js | 2 ++ src/js/controllers/walletHome.js | 1 + src/js/init.js | 4 +++- 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js index 155e4a883..b6777f326 100644 --- a/src/js/controllers/buyGlidera.js +++ b/src/js/controllers/buyGlidera.js @@ -9,6 +9,8 @@ angular.module('copayApp.controllers').controller('buyGlideraController', this.success = null; this.loading = null; + window.ignoreMobilePause = true; + var otherWallets = function(testnet) { var network = testnet ? 'testnet' : 'livenet'; return lodash.filter(profileService.getWallets(network), function(w) { diff --git a/src/js/controllers/glidera.js b/src/js/controllers/glidera.js index 87024f2e4..94659b3f9 100644 --- a/src/js/controllers/glidera.js +++ b/src/js/controllers/glidera.js @@ -3,6 +3,8 @@ angular.module('copayApp.controllers').controller('glideraController', function($scope, $timeout, $modal, profileService, configService, storageService, glideraService, isChromeApp, animationService) { + window.ignoreMobilePause = true; + this.getAuthenticateUrl = function() { return glideraService.getOauthCodeUrl(); }; diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js index 616892aa7..cbae3f8f3 100644 --- a/src/js/controllers/sellGlidera.js +++ b/src/js/controllers/sellGlidera.js @@ -14,6 +14,8 @@ angular.module('copayApp.controllers').controller('sellGlideraController', this.currentFeeLevel = config.wallet.settings.feeLevel || 'normal'; var fc; + window.ignoreMobilePause = true; + var otherWallets = function(testnet) { var network = testnet ? 'testnet' : 'livenet'; return lodash.filter(profileService.getWallets(network), function(w) { diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index c27076b7a..e1edca494 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -3,6 +3,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go, feeService) { var self = this; + window.ignoreMobilePause = false; $rootScope.hideMenuBar = false; $rootScope.wpInputFocused = false; var config = configService.getSync(); diff --git a/src/js/init.js b/src/js/init.js index 9c6b29c7b..9da59595b 100644 --- a/src/js/init.js +++ b/src/js/init.js @@ -45,7 +45,9 @@ angular.element(document).ready(function() { }, 100); } setTimeout(function() { - window.ignoreMobilePause = false; + var loc = window.location; + var ignoreMobilePause = loc.toString().match(/(glidera|buy|sell)/) ? 'true' : 'false'; + window.ignoreMobilePause = ignoreMobilePause; }, 100); }, false);