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

adding controllers to route file, moving swipe back enable to enter event

Browse source
This commit is contained in:
Gabriel Bazán 2017-03-03 10:36:19 -03:00
commit 14baa77404
15 changed files with 50 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/controllers/onboarding/backupRequest.js
View file

@ -4,12 +4,12 @@ angular.module('copayApp.controllers').controller('backupRequestController', fun
$scope.walletId = $stateParams.walletId;
$scope.$on("$ionicView.beforeLeave", function(event, data) {
$ionicConfig.views.swipeBackEnabled(true);
$scope.$on("$ionicView.enter", function() {
$ionicConfig.views.swipeBackEnabled(false);
});
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$ionicConfig.views.swipeBackEnabled(false);
$scope.$on("$ionicView.beforeLeave", function() {
$ionicConfig.views.swipeBackEnabled(true);
});
$scope.openPopup = function() {

2
src/js/controllers/onboarding/collectEmail.js
View file

@ -6,7 +6,7 @@ angular.module('copayApp.controllers').controller('collectEmailController', func
$ionicConfig.views.swipeBackEnabled(true);
});
$scope.$on("$ionicView.beforeEnter", function() {
$scope.$on("$ionicView.enter", function() {
$ionicConfig.views.swipeBackEnabled(false);
});

9
src/js/controllers/onboarding/disclaimer.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, profileService, uxLanguage, externalLinkService, storageService, $stateParams, startupService, $rootScope) {
angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, $ionicConfig, profileService, uxLanguage, externalLinkService, storageService, $stateParams, startupService, $rootScope) {
$scope.$on("$ionicView.afterEnter", function() {
startupService.ready();
@ -11,12 +11,15 @@ angular.module('copayApp.controllers').controller('disclaimerController', functi
$scope.terms = {};
$scope.accepted = {};
$scope.accepted.first = $scope.accepted.second = $scope.accepted.third = false;
$scope.backedUp = $stateParams.backedUp;
$scope.backedUp = $stateParams.backedUp == 'false' ? false : true;
$scope.resume = $stateParams.resume || false;
if ($scope.backedUp || $scope.resume) $ionicConfig.views.swipeBackEnabled(false);
$scope.shrinkView = false;
});
$scope.$on("$ionicView.enter", function() {
if ($scope.backedUp || $scope.resume) $ionicConfig.views.swipeBackEnabled(false);
});
$scope.$on("$ionicView.beforeLeave", function() {
$ionicConfig.views.swipeBackEnabled(true);
});

2
src/js/controllers/onboarding/notifications.js
View file

@ -2,7 +2,7 @@
angular.module('copayApp.controllers').controller('notificationsController', function($scope, $state, $timeout, $stateParams, $ionicConfig, profileService, configService, $interval) {
$scope.$on("$ionicView.beforeEnter", function() {
$scope.$on("$ionicView.enter", function() {
$ionicConfig.views.swipeBackEnabled(false);
});

4
src/js/controllers/onboarding/welcomeController.js
View file

@ -2,11 +2,11 @@
angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $ionicConfig, $log, profileService, startupService, storageService) {
$scope.$parent.$on("$ionicView.afterEnter", function() {
$scope.$on("$ionicView.afterEnter", function() {
startupService.ready();
});
$scope.$on("$ionicView.beforeEnter", function() {
$scope.$on("$ionicView.enter", function() {
$ionicConfig.views.swipeBackEnabled(false);
});