fix scroll resize in send view and adding timeout to ionicScrollDelegate.resize

This commit is contained in:
Gabriel Bazán 2016-12-14 15:37:15 -03:00
commit db987e4817
8 changed files with 23 additions and 21 deletions

View file

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

View file

@ -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;
}

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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