Merge pull request #3760 from cmgustavo/bug/glidera-resume-event

Bug/glidera resume event

public/views/glidera.html

@@ -6,7 +6,7 @@
 </div>
 
 
-<div class="content glidera" ng-controller="glideraController as glidera">
+<div class="content glidera p20b" ng-controller="glideraController as glidera">
 
   <div class="onGoingProcess" ng-show="glidera.loading || index.glideraLoading">
     <div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">

public/views/modals/glidera-tx-details.html

@@ -30,7 +30,7 @@
     </div>
   </div>
 
-  <ul class="no-bullet size-14 m0">
+  <ul class="no-bullet size-14">
 
     <li class="line-b p10 oh">
       <span class="text-gray">Status</span>

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) {

src/js/controllers/glidera.js

@@ -1,7 +1,9 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('glideraController', 
-  function($scope, $timeout, $modal, profileService, configService, storageService, glideraService, isChromeApp, animationService) {
+  function($rootScope, $scope, $timeout, $modal, profileService, configService, storageService, glideraService, isChromeApp, animationService, lodash) {
+
+    window.ignoreMobilePause = true;
 
     this.getAuthenticateUrl = function() {
       return glideraService.getOauthCodeUrl();
@@ -35,6 +37,7 @@ angular.module('copayApp.controllers').controller('glideraController',
     };
 
     this.openTxModal = function(token, tx) {
+      $rootScope.modalOpened = true;
       var self = this;
       var config = configService.getSync().wallet.settings;
       var fc = profileService.focusedClient;
@@ -48,9 +51,9 @@ angular.module('copayApp.controllers').controller('glideraController',
           $scope.tx = tx;
         });
 
-        $scope.cancel = function() {
+        $scope.cancel = lodash.debounce(function() {
           $modalInstance.dismiss('cancel');
-        };
+        }, 0, 1000);
 
       };
 
@@ -60,7 +63,13 @@ angular.module('copayApp.controllers').controller('glideraController',
           controller: ModalInstanceCtrl,
       });
 
+      var disableCloseModal = $rootScope.$on('closeModal', function() {
+        modalInstance.dismiss('cancel');
+      });
+
       modalInstance.result.finally(function() {
+        $rootScope.modalOpened = false;
+        disableCloseModal();
         var m = angular.element(document.getElementsByClassName('reveal-modal'));
         m.addClass(animationService.modalAnimated.slideOutRight);
       });

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) {

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();

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);