From db987e48171ef6a7b3c8fc4952c7e6630993bc54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 14 Dec 2016 15:37:15 -0300 Subject: [PATCH] fix scroll resize in send view and adding timeout to ionicScrollDelegate.resize --- src/js/controllers/addresses.js | 4 ++-- src/js/controllers/advancedSettings.js | 18 ++++++++++-------- src/js/controllers/create.js | 2 +- src/js/controllers/export.js | 2 +- src/js/controllers/import.js | 2 +- src/js/controllers/join.js | 2 +- src/js/controllers/tab-home.js | 6 +++--- src/js/controllers/tab-send.js | 8 ++++---- 8 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/js/controllers/addresses.js b/src/js/controllers/addresses.js index 9b31e431f..90cf0bb5e 100644 --- a/src/js/controllers/addresses.js +++ b/src/js/controllers/addresses.js @@ -104,14 +104,14 @@ angular.module('copayApp.controllers').controller('addressesController', functio $timeout(function() { $scope.showInfo = !$scope.showInfo; $ionicScrollDelegate.resize(); - }); + }, 10); }; $scope.readMore = function() { $timeout(function() { $scope.showMore = !$scope.showMore; $ionicScrollDelegate.resize(); - }); + }, 10); }; $scope.showMenu = function(allAddresses, $event) { diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js index 22256de57..4abb4c261 100644 --- a/src/js/controllers/advancedSettings.js +++ b/src/js/controllers/advancedSettings.js @@ -30,22 +30,24 @@ angular.module('copayApp.controllers').controller('advancedSettingsController', }; $scope.global = $rootScope; - if(!$scope.global.developmentUtilitiesEnabled){ + if (!$scope.global.developmentUtilitiesEnabled) { $scope.global.developmentUtilitiesEnabled = { value: false }; } - $scope.toggledDevelopmentUtils = function (){ - if($scope.global.developmentUtilitiesEnabled.value){ + $scope.toggledDevelopmentUtils = function() { + if ($scope.global.developmentUtilitiesEnabled.value) { $log.debug('User enabled development utilities.'); - $ionicScrollDelegate.resize(); + $timeout(function() { + $ionicScrollDelegate.resize(); + }, 10); } else { $log.debug('User disabled development utilities.'); } } - $scope.activateFeedbackCard = function () { + $scope.activateFeedbackCard = function() { $scope.feedbackCardActivating = true; storageService.getFeedbackInfo(function(error, info) { var feedbackInfo = JSON.parse(info); @@ -56,10 +58,10 @@ angular.module('copayApp.controllers').controller('advancedSettingsController', storageService.setFeedbackInfo(JSON.stringify(feedbackInfo), function() { $log.debug('Activated feedback card with: ' + JSON.stringify(feedbackInfo)); $ionicHistory.clearCache(); - $timeout(function(){ + $timeout(function() { $scope.feedbackCardActivating = false; $scope.feedbackCardActivated = true; - $timeout(function(){ + $timeout(function() { $scope.feedbackCardActivated = false; }, 10000); }, 500); @@ -67,7 +69,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController', }); } - $scope.resetActivateFeedbackCard = function(){ + $scope.resetActivateFeedbackCard = function() { $scope.feedbackCardActivated = false; } diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index 3d948d295..ed567bf0d 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -43,7 +43,7 @@ angular.module('copayApp.controllers').controller('createController', $scope.resizeView = function() { $timeout(function() { $ionicScrollDelegate.resize(); - }); + }, 10); checkPasswordFields(); }; diff --git a/src/js/controllers/export.js b/src/js/controllers/export.js index 358a211da..bec190995 100644 --- a/src/js/controllers/export.js +++ b/src/js/controllers/export.js @@ -12,7 +12,7 @@ angular.module('copayApp.controllers').controller('exportController', $scope.resizeView = function() { $timeout(function() { $ionicScrollDelegate.resize(); - }); + }, 10); }; function getPassword(cb) { diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index 3d3b1fbce..959509775 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -360,7 +360,7 @@ angular.module('copayApp.controllers').controller('importController', $scope.resizeView = function() { $timeout(function() { $ionicScrollDelegate.resize(); - }); + }, 10); }; }); diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index 3b0362d60..8dbf6cffb 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -20,7 +20,7 @@ angular.module('copayApp.controllers').controller('joinController', $scope.resizeView = function() { $timeout(function() { $ionicScrollDelegate.resize(); - }); + }, 10); checkPasswordFields(); }; diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index d520ef88e..a2ca1950d 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -187,7 +187,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', $timeout(function() { $ionicScrollDelegate.resize(); $scope.$apply(); - }, 100); + }, 10); }) }; @@ -240,7 +240,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', $timeout(function() { $ionicScrollDelegate.resize(); $scope.$apply(); - }, 100); + }, 10); }); }; @@ -269,7 +269,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', $timeout(function() { $ionicScrollDelegate.resize(); $scope.$apply(); - }, 100); + }, 10); }; var bitpayCardCache = function() { diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js index b905b16a6..c4deabc97 100644 --- a/src/js/controllers/tab-send.js +++ b/src/js/controllers/tab-send.js @@ -55,7 +55,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function( $timeout(function() { $ionicScrollDelegate.resize(); $scope.$apply(); - }); + }, 10); }); }; @@ -145,15 +145,15 @@ angular.module('copayApp.controllers').controller('tabSendController', function( if (index == wallets.length) { $scope.checkingBalance = false; + if ($scope.hasFunds != true) { + $ionicScrollDelegate.freezeScroll(true); + } $timeout(function() { $scope.$apply(); }); } }); }); - if ($scope.hasFunds != true) { - $ionicScrollDelegate.freezeScroll(true); - } }; $scope.$on("$ionicView.beforeEnter", function(event, data) {