summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArjun Roychowdhury <pliablepixels@gmail.com>2015-09-17 12:32:30 -0400
committerArjun Roychowdhury <pliablepixels@gmail.com>2015-09-17 12:32:30 -0400
commita0b74399c4f1a7754029e1fd7f4be3b20836404a (patch)
treee113993cc5ed8be999144c3b1052b45a10a03695
parentd27bb00333eec3050dd2273ca1c1fbc2004aaeb2 (diff)
made sure we force remove modal only if it is valid
-rw-r--r--www/js/MonitorCtrl.js2
-rw-r--r--www/js/MontageCtrl.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index 2b1d1e9e..2ed75ee1 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -198,7 +198,7 @@ angular.module('zmApp.controllers').controller('zmApp.MonitorCtrl', ['$ionicPopu
$scope.$on('$ionicView.leave', function () {
console.log("**VIEW ** Monitor Ctrl Left, force removing modal");
- $scope.modal.remove();
+ if ($scope.modal) $scope.modal.remove();
});
$scope.$on('$ionicView.unloaded', function () {
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 53246bb9..85604dcf 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -711,7 +711,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
$scope.$on('$ionicView.leave', function () {
console.log("**VIEW ** Montage Ctrl Left, force removing modal");
- $scope.modal.remove();
+ if ($scope.modal) $scope.modal.remove();
});
$scope.$on('$ionicView.unloaded', function () {