diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-04-02 16:43:35 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-04-02 16:43:35 -0400 |
| commit | 3677b13a59fb77df778aff01d8e815150f6ec86b (patch) | |
| tree | 0b60009590d8b10d2849b04f8b8a9efbbcb124c8 /www/js/EventModalCtrl.js | |
| parent | 11fb620b9234b174aa232ec51a2555aec6dcb7dd (diff) | |
#209 and #215 - have fun
Former-commit-id: 4b8bd8773014a7f6d34b011494e6451ae15b326f
Diffstat (limited to 'www/js/EventModalCtrl.js')
| -rw-r--r-- | www/js/EventModalCtrl.js | 11 |
1 files changed, 9 insertions, 2 deletions
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"); |
