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

Fix back button from share app

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-11-17 11:06:22 -03:00
commit d8d565f1d3
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
5 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,20 +46,18 @@ angular.module('copayApp.controllers').controller('completeController', function
});
};
$scope.$on("$ionicView.afterEnter", function() {
$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;
$scope.rated = (data.stateParams && data.stateParams.rated) ? true : false;
$scope.fromSettings = (data.stateParams && data.stateParams.fromSettings) ? true : false;
if (!$scope.fromSettings) {
$ionicConfig.views.swipeBackEnabled(false);
} else {
$ionicNavBarDelegate.showBackButton(true);
$ionicConfig.views.swipeBackEnabled(true);
}
});
$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;
$scope.rated = (data.stateParams && data.stateParams.rated) ? true : false;
$scope.fromSettings = (data.stateParams && data.stateParams.fromSettings) ? true : false;
storageService.getFeedbackInfo(function(error, info) {
var feedbackInfo = lodash.isString(info) ? JSON.parse(info) : null;

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

@ -54,9 +54,8 @@ angular.module('copayApp.controllers').controller('sendController', function($sc
$scope.feedback = {};
if ($scope.score) {
$ionicNavBarDelegate.showBackButton(false);
$ionicConfig.views.swipeBackEnabled(false);
} else $ionicNavBarDelegate.showBackButton(true);
}
switch ($scope.score) {
case 1:
@ -90,4 +89,12 @@ angular.module('copayApp.controllers').controller('sendController', function($sc
$scope.showForm = true;
});
$scope.goBack = function() {
$ionicHistory.nextViewOptions({
disableAnimate: false,
historyRoot: true
});
$ionicHistory.goBack();
};
});

3
src/sass/ionic.scss
View file

@ -7,7 +7,8 @@
// Please include a description of the problem solved by the workaround.
// class to dynamically hide the ion-nav-bar for v1 Amazon flow
ion-nav-bar.hide { display: block !important; }
// Fix hide-nav-bar (true|false)
//ion-nav-bar.hide { display: block !important; }
// the ion tabs element never needs it's own background (backgrounds are
// rendered by the tabs), and the default background would cover the scanner