From b9ba2af9934fe5a6aed6092837194a30c95803b2 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 10 Oct 2016 10:56:12 -0400 Subject: [PATCH] disable swipe back functionality at the controller level --- src/js/controllers/confirm.js | 4 +++- src/js/routes.js | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index da772543f..23440c11c 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -1,9 +1,11 @@ 'use strict'; -angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, gettext, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory) { +angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, gettext, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig) { var cachedTxp = {}; var isChromeApp = platformInfo.isChromeApp; + $ionicConfig.views.swipeBackEnabled(false); + $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.isWallet = data.stateParams.isWallet; $scope.isCard = data.stateParams.isCard; diff --git a/src/js/routes.js b/src/js/routes.js index 183e5eab3..a69f00072 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -32,7 +32,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr // NAV BACK-BUTTON TEXT/ICON $ionicConfigProvider.backButton.icon('icon ion-ios-arrow-thin-left').text(''); $ionicConfigProvider.backButton.previousTitleText(false); - $ionicConfigProvider.views.swipeBackEnabled(false); $logProvider.debugEnabled(true); $provide.decorator('$log', ['$delegate', 'platformInfo',