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

6
src/js/controllers/confirm.js
View file

@ -12,9 +12,11 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$ionicConfig.views.swipeBackEnabled(true);
});
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.$on("$ionicView.enter", function(event, data) {
$ionicConfig.views.swipeBackEnabled(false);
});
$scope.$on("$ionicView.beforeEnter", function(event, data) {
toAmount = data.stateParams.toAmount;
cachedSendMax = {};

7
src/js/controllers/feedback/complete.js
View file

@ -50,6 +50,11 @@ angular.module('copayApp.controllers').controller('completeController', function
$ionicConfig.views.swipeBackEnabled(true);
});
$scope.$on("$ionicView.enter", function() {
if (!$scope.fromSettings)
$ionicConfig.views.swipeBackEnabled(false);
});
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.score = (data.stateParams && data.stateParams.score) ? parseInt(data.stateParams.score) : null;
$scope.skipped = (data.stateParams && data.stateParams.skipped) ? true : false;
@ -57,11 +62,9 @@ angular.module('copayApp.controllers').controller('completeController', function
$scope.fromSettings = (data.stateParams && data.stateParams.fromSettings) ? true : false;
if (!$scope.fromSettings) {
$ionicConfig.views.swipeBackEnabled(false);
$ionicNavBarDelegate.showBackButton(false);
} else {
$ionicNavBarDelegate.showBackButton(true);
$ionicConfig.views.swipeBackEnabled(true);
}
storageService.getFeedbackInfo(function(error, info) {

9
src/js/controllers/feedback/send.js
View file

@ -45,15 +45,16 @@ angular.module('copayApp.controllers').controller('sendController', function($sc
$ionicConfig.views.swipeBackEnabled(true);
});
$scope.$on("$ionicView.enter", function(event, data) {
if ($scope.score)
$ionicConfig.views.swipeBackEnabled(false);
});
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.isCordova = platformInfo.isCordova;
$scope.score = (data.stateParams && data.stateParams.score) ? parseInt(data.stateParams.score) : null;
$scope.feedback = {};
if ($scope.score) {
$ionicConfig.views.swipeBackEnabled(false);
}
switch ($scope.score) {
case 1:
$scope.reaction = "Ouch!";

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

21
src/js/routes.js
View file

@ -699,7 +699,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/welcome',
views: {
'onboarding': {
templateUrl: 'views/onboarding/welcome.html'
templateUrl: 'views/onboarding/welcome.html',
controller: 'welcomeController'
}
}
})
@ -707,7 +708,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/tour',
views: {
'onboarding': {
templateUrl: 'views/onboarding/tour.html'
templateUrl: 'views/onboarding/tour.html',
controller: 'tourController'
}
}
})
@ -715,7 +717,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/collectEmail/:walletId',
views: {
'onboarding': {
templateUrl: 'views/onboarding/collectEmail.html'
templateUrl: 'views/onboarding/collectEmail.html',
controller: 'collectEmailController'
}
}
})
@ -723,7 +726,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/notifications/:walletId',
views: {
'onboarding': {
templateUrl: 'views/onboarding/notifications.html'
templateUrl: 'views/onboarding/notifications.html',
controller: 'notificationsController'
}
}
})
@ -731,7 +735,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/backupRequest/:walletId',
views: {
'onboarding': {
templateUrl: 'views/onboarding/backupRequest.html'
templateUrl: 'views/onboarding/backupRequest.html',
controller: 'backupRequestController'
}
}
})
@ -739,7 +744,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/backupWarning/:from/:walletId',
views: {
'onboarding': {
templateUrl: 'views/backupWarning.html'
templateUrl: 'views/backupWarning.html',
controller: 'backupWarningController'
}
}
})
@ -765,7 +771,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/terms',
views: {
'onboarding': {
templateUrl: 'views/onboarding/terms.html'
templateUrl: 'views/onboarding/terms.html',
controller: 'termsController'
}
}
})