summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorArjun Roychowdhury <pliablepixels@gmail.com>2015-09-16 20:22:26 -0400
committerArjun Roychowdhury <pliablepixels@gmail.com>2015-09-16 20:22:26 -0400
commitdd7aa3219123d496fe93c773cbaf996748ea880c (patch)
tree8295e1e6a358b1c71549b1d113b1d48877f7d013 /www
parent5e448a7927d867c05583a93c4134b4a0c140768f (diff)
took care of destroying modals on background resume so pin code view can show
Diffstat (limited to 'www')
-rw-r--r--www/js/MonitorCtrl.js3
-rw-r--r--www/js/MontageCtrl.js3
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 () {