From 0b601d0dd77c504c21e71a6cb704346927de1140 Mon Sep 17 00:00:00 2001 From: blavenie <benoit.lavenier@e-is.pro> Date: Thu, 9 Nov 2017 18:33:34 +0100 Subject: [PATCH] [fix] force enableBack on some pages ONLY on small screen --- www/js/controllers/wot-controllers.js | 2 +- www/plugins/es/js/controllers/registry-controllers.js | 2 +- www/plugins/map/js/controllers/registry-controllers.js | 2 +- www/plugins/map/js/controllers/wot-controllers.js | 2 +- www/templates/wot/lookup_form.html | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/www/js/controllers/wot-controllers.js b/www/js/controllers/wot-controllers.js index e59cc250b..2ea5b05a0 100644 --- a/www/js/controllers/wot-controllers.js +++ b/www/js/controllers/wot-controllers.js @@ -630,7 +630,7 @@ function WotIdentityAbstractController($scope, $rootScope, $state, $translate, $ $scope.$on('$ionicView.beforeEnter', function (event, viewData) { // Enable back button (workaround need for navigation outside tabs - https://stackoverflow.com/a/35064602) - viewData.enableBack = UIUtils.screen.isSmall(); + viewData.enableBack = UIUtils.screen.isSmall() ? true : viewData.enableBack; }); $scope.load = function(pubkey, withCache, uid) { diff --git a/www/plugins/es/js/controllers/registry-controllers.js b/www/plugins/es/js/controllers/registry-controllers.js index b3b547b33..ed39f52b9 100644 --- a/www/plugins/es/js/controllers/registry-controllers.js +++ b/www/plugins/es/js/controllers/registry-controllers.js @@ -788,7 +788,7 @@ function ESRegistryRecordViewController($scope, $rootScope, $state, $q, $timeout $scope.$on('$ionicView.beforeEnter', function (event, viewData) { // Enable back button (workaround need for navigation outside tabs - https://stackoverflow.com/a/35064602) - viewData.enableBack = UIUtils.screen.isSmall(); + viewData.enableBack = UIUtils.screen.isSmall() ? true : viewData.enableBack; }); $scope.$on('$ionicView.enter', function(e, state) { diff --git a/www/plugins/map/js/controllers/registry-controllers.js b/www/plugins/map/js/controllers/registry-controllers.js index dcb8bc02a..9efde6a6e 100644 --- a/www/plugins/map/js/controllers/registry-controllers.js +++ b/www/plugins/map/js/controllers/registry-controllers.js @@ -118,7 +118,7 @@ function MapRegistryViewController($scope, $filter, $templateCache, $interpolate $scope.$on('$ionicView.beforeEnter', function (event, viewData) { // Enable back button (workaround need for navigation outside tabs - https://stackoverflow.com/a/35064602) - viewData.enableBack = UIUtils.screen.isSmall(); + viewData.enableBack = UIUtils.screen.isSmall() ? true : viewData.enableBack; }); $scope.enter = function(e, state) { diff --git a/www/plugins/map/js/controllers/wot-controllers.js b/www/plugins/map/js/controllers/wot-controllers.js index 9eef90bcd..cb57dbf5e 100644 --- a/www/plugins/map/js/controllers/wot-controllers.js +++ b/www/plugins/map/js/controllers/wot-controllers.js @@ -110,7 +110,7 @@ function MapWotViewController($scope, $filter, $templateCache, $interpolate, $ti $scope.$on('$ionicView.beforeEnter', function (event, viewData) { // Enable back button (workaround need for navigation outside tabs - https://stackoverflow.com/a/35064602) - viewData.enableBack = UIUtils.screen.isSmall(); + viewData.enableBack = UIUtils.screen.isSmall() ? true : viewData.enableBack; }); $scope.enter = function(e, state) { diff --git a/www/templates/wot/lookup_form.html b/www/templates/wot/lookup_form.html index 1879a5dc6..151ffc370 100644 --- a/www/templates/wot/lookup_form.html +++ b/www/templates/wot/lookup_form.html @@ -65,7 +65,6 @@ <i class="icon ion-person-stalker"></i> {{'WOT.LOOKUP.BTN_NEWCOMERS' | translate}} </a> - <a ng-if="enableFilter" class="button button-text button-small ink" ng-class="{'button-text-positive': search.type=='pending'}" -- GitLab