From 46a0303586639c5e7c6d68c205135425b15bf386 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 16 Nov 2016 13:06:02 -0500 Subject: [PATCH] remove old status bar hiding code --- src/js/controllers/feedback/complete.js | 11 ----------- src/js/controllers/feedback/rateApp.js | 14 -------------- src/js/routes.js | 17 +++-------------- 3 files changed, 3 insertions(+), 39 deletions(-) diff --git a/src/js/controllers/feedback/complete.js b/src/js/controllers/feedback/complete.js index 2422a22ec..f50c5df13 100644 --- a/src/js/controllers/feedback/complete.js +++ b/src/js/controllers/feedback/complete.js @@ -31,10 +31,6 @@ angular.module('copayApp.controllers').controller('completeController', function }; $scope.$on("$ionicView.beforeEnter", function(event, data) { - if (window.StatusBar) { - $log.debug('Hiding status bar...'); - StatusBar.hide(); - } storageService.getFeedbackInfo(function(error, info) { var feedbackInfo = lodash.isString(info) ? JSON.parse(info) : null; @@ -95,13 +91,6 @@ angular.module('copayApp.controllers').controller('completeController', function }, 100); }); - $scope.$on("$ionicView.afterLeave", function() { - if (window.StatusBar) { - $log.debug('Showing status bar...'); - StatusBar.show(); - } - }); - $scope.close = function() { $ionicHistory.clearHistory(); $ionicHistory.nextViewOptions({ diff --git a/src/js/controllers/feedback/rateApp.js b/src/js/controllers/feedback/rateApp.js index 6d16cfb24..b72b07433 100644 --- a/src/js/controllers/feedback/rateApp.js +++ b/src/js/controllers/feedback/rateApp.js @@ -29,20 +29,6 @@ angular.module('copayApp.controllers').controller('rateAppController', function( }); }; - $scope.$on("$ionicView.beforeEnter", function() { - if(window.StatusBar){ - $log.debug('Hiding status bar...'); - StatusBar.hide(); - } - }); - - $scope.$on("$ionicView.afterLeave", function() { - if(window.StatusBar){ - $log.debug('Showing status bar...'); - StatusBar.show(); - } - }); - $scope.sendFeedback = function() { $state.go('tabs.rate.send', { score: $scope.score diff --git a/src/js/routes.js b/src/js/routes.js index 2d42d17e9..6e5c7fb57 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -750,17 +750,11 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr templateUrl: 'views/feedback/send.html', controller: 'sendController' } - }, - customConfig: { - hideStatusBar: true } }) .state('tabs.rate', { url: '/rate', - abstract: true, - customConfig: { - hideStatusBar: true - } + abstract: true }) .state('tabs.rate.send', { url: '/send/:score', @@ -769,9 +763,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr templateUrl: 'views/feedback/send.html', controller: 'sendController' } - }, - customConfig: { - hideStatusBar: true } }) .state('tabs.rate.complete', { @@ -1107,16 +1098,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr $log.debug('Route change from:', fromState.name || '-', ' to:', toState.name); $log.debug(' toParams:' + JSON.stringify(toParams || {})); $log.debug(' fromParams:' + JSON.stringify(fromParams || {})); + }); - console.log('toState', toState); - + $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams) { if(toState.customConfig && toState.customConfig.hideStatusBar) { - console.log('hiding status bar'); if($window.StatusBar) { $window.StatusBar.hide(); } } else { - console.log('showing status bar'); if($window.StatusBar) { $window.StatusBar.show(); }