From dd7aa3219123d496fe93c773cbaf996748ea880c Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Wed, 16 Sep 2015 20:22:26 -0400 Subject: took care of destroying modals on background resume so pin code view can show --- www/js/MonitorCtrl.js | 3 ++- www/js/MontageCtrl.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js index 165c7c6b..2b1d1e9e 100644 --- a/www/js/MonitorCtrl.js +++ b/www/js/MonitorCtrl.js @@ -197,7 +197,8 @@ angular.module('zmApp.controllers').controller('zmApp.MonitorCtrl', ['$ionicPopu }); $scope.$on('$ionicView.leave', function () { - console.log("**VIEW ** Monitor Ctrl Left"); + console.log("**VIEW ** Monitor Ctrl Left, force removing modal"); + $scope.modal.remove(); }); $scope.$on('$ionicView.unloaded', function () { diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 4ee543d4..53246bb9 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -710,7 +710,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' }); $scope.$on('$ionicView.leave', function () { - console.log("**VIEW ** Montage Ctrl Left"); + console.log("**VIEW ** Montage Ctrl Left, force removing modal"); + $scope.modal.remove(); }); $scope.$on('$ionicView.unloaded', function () { -- cgit v1.2.3