anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

improve performance and UX - handle history views properly

Browse source
This commit is contained in:
JDonadio 2017-03-08 16:02:34 -03:00
commit d4c8576032
4 changed files with 16 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/advancedSettings.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $timeout, $state, $log, $window, $ionicModal, lodash, configService, uxLanguage, platformInfo, pushNotificationsService, profileService, feeService, storageService, $ionicHistory, $ionicScrollDelegate, pincodeService) {
angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $timeout, $state, $log, $window, $ionicModal, lodash, configService, uxLanguage, platformInfo, pushNotificationsService, profileService, feeService, storageService, $ionicHistory, $ionicScrollDelegate) {
var updateConfig = function() {
var config = configService.getSync();

16
src/js/controllers/pincode.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('pincodeController', function($state, $stateParams, $timeout, $scope, $log, $window, configService) {
angular.module('copayApp.controllers').controller('pincodeController', function($state, $stateParams, $ionicHistory, $timeout, $scope, $log, $window, configService) {
$scope.$on("$ionicView.beforeEnter", function(event) {
$scope.currentPincode = $scope.newPincode = '';
@ -39,8 +39,7 @@ angular.module('copayApp.controllers').controller('pincodeController', function(
if (!$scope.locking) {
if (match) {
$scope.fromSettings ? saveSettings($scope.locking, '') : $scope.close();
return;
$scope.fromSettings ? saveSettings($scope.locking, '') : $scope.close(150);
}
} else {
checkCodes();
@ -70,14 +69,13 @@ angular.module('copayApp.controllers').controller('pincodeController', function(
configService.set(opts, function(err) {
if (err) $log.debug(err);
$timeout(function() {
$scope.close();
});
$scope.close();
});
};
$scope.close = function() {
if ($scope.fromSettings) $state.go('tabs.advanced');
else $state.go('tabs.home');
$scope.close = function(delay) {
$timeout(function() {
$ionicHistory.viewHistory().backView ? $ionicHistory.goBack() : $state.go('tabs.home');
}, delay || 1);
};
});