From 3677b13a59fb77df778aff01d8e815150f6ec86b Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Sat, 2 Apr 2016 16:43:35 -0400 Subject: #209 and #215 - have fun Former-commit-id: 4b8bd8773014a7f6d34b011494e6451ae15b326f --- www/js/EventModalCtrl.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'www/js/EventModalCtrl.js') diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index ca811e9e..d0fa2991 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -647,7 +647,10 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro }); - $scope.$on('modal.shown', function () { + $scope.$on('modal.shown', function (e,m) { + + if (m.id != 'footage') + return; var ld = ZMDataModel.getLogin(); $scope.loginData = ZMDataModel.getLogin(); @@ -696,7 +699,11 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro }); - $scope.$on('modal.removed', function () { + $scope.$on('modal.removed', function (e,m) { + + if (m.id != 'footage') + return; + $scope.isModalActive = false; //console.log("**MODAL REMOVED: Stopping modal timer"); -- cgit v1.2.3