Merge pull request #5230 from gabrielbazan7/fix/scrollSendView

fix scroll resize send view and adding timeout to ionicScrollDelegate.resize
This commit is contained in:
Gustavo Maximiliano Cortez 2016-12-14 16:26:03 -03:00 committed by GitHub
commit e927c00a14
8 changed files with 23 additions and 21 deletions

View file

@ -104,14 +104,14 @@ angular.module('copayApp.controllers').controller('addressesController', functio
$timeout(function() { $timeout(function() {
$scope.showInfo = !$scope.showInfo; $scope.showInfo = !$scope.showInfo;
$ionicScrollDelegate.resize(); $ionicScrollDelegate.resize();
}); }, 10);
}; };
$scope.readMore = function() { $scope.readMore = function() {
$timeout(function() { $timeout(function() {
$scope.showMore = !$scope.showMore; $scope.showMore = !$scope.showMore;
$ionicScrollDelegate.resize(); $ionicScrollDelegate.resize();
}); }, 10);
}; };
$scope.showMenu = function(allAddresses, $event) { $scope.showMenu = function(allAddresses, $event) {

View file

@ -39,7 +39,9 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
$scope.toggledDevelopmentUtils = function() { $scope.toggledDevelopmentUtils = function() {
if ($scope.global.developmentUtilitiesEnabled.value) { if ($scope.global.developmentUtilitiesEnabled.value) {
$log.debug('User enabled development utilities.'); $log.debug('User enabled development utilities.');
$timeout(function() {
$ionicScrollDelegate.resize(); $ionicScrollDelegate.resize();
}, 10);
} else { } else {
$log.debug('User disabled development utilities.'); $log.debug('User disabled development utilities.');
} }

View file

@ -43,7 +43,7 @@ angular.module('copayApp.controllers').controller('createController',
$scope.resizeView = function() { $scope.resizeView = function() {
$timeout(function() { $timeout(function() {
$ionicScrollDelegate.resize(); $ionicScrollDelegate.resize();
}); }, 10);
checkPasswordFields(); checkPasswordFields();
}; };

View file

@ -12,7 +12,7 @@ angular.module('copayApp.controllers').controller('exportController',
$scope.resizeView = function() { $scope.resizeView = function() {
$timeout(function() { $timeout(function() {
$ionicScrollDelegate.resize(); $ionicScrollDelegate.resize();
}); }, 10);
}; };
function getPassword(cb) { function getPassword(cb) {

View file

@ -360,7 +360,7 @@ angular.module('copayApp.controllers').controller('importController',
$scope.resizeView = function() { $scope.resizeView = function() {
$timeout(function() { $timeout(function() {
$ionicScrollDelegate.resize(); $ionicScrollDelegate.resize();
}); }, 10);
}; };
}); });

View file

@ -20,7 +20,7 @@ angular.module('copayApp.controllers').controller('joinController',
$scope.resizeView = function() { $scope.resizeView = function() {
$timeout(function() { $timeout(function() {
$ionicScrollDelegate.resize(); $ionicScrollDelegate.resize();
}); }, 10);
checkPasswordFields(); checkPasswordFields();
}; };

View file

@ -187,7 +187,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
$timeout(function() { $timeout(function() {
$ionicScrollDelegate.resize(); $ionicScrollDelegate.resize();
$scope.$apply(); $scope.$apply();
}, 100); }, 10);
}) })
}; };
@ -240,7 +240,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
$timeout(function() { $timeout(function() {
$ionicScrollDelegate.resize(); $ionicScrollDelegate.resize();
$scope.$apply(); $scope.$apply();
}, 100); }, 10);
}); });
}; };
@ -269,7 +269,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
$timeout(function() { $timeout(function() {
$ionicScrollDelegate.resize(); $ionicScrollDelegate.resize();
$scope.$apply(); $scope.$apply();
}, 100); }, 10);
}; };
var bitpayCardCache = function() { var bitpayCardCache = function() {

View file

@ -55,7 +55,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
$timeout(function() { $timeout(function() {
$ionicScrollDelegate.resize(); $ionicScrollDelegate.resize();
$scope.$apply(); $scope.$apply();
}); }, 10);
}); });
}; };
@ -145,15 +145,15 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
if (index == wallets.length) { if (index == wallets.length) {
$scope.checkingBalance = false; $scope.checkingBalance = false;
if ($scope.hasFunds != true) {
$ionicScrollDelegate.freezeScroll(true);
}
$timeout(function() { $timeout(function() {
$scope.$apply(); $scope.$apply();
}); });
} }
}); });
}); });
if ($scope.hasFunds != true) {
$ionicScrollDelegate.freezeScroll(true);
}
}; };
$scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.$on("$ionicView.beforeEnter", function(event, data) {