diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-01-24 09:34:47 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-01-24 09:34:47 -0500 |
| commit | 02596e5821ba01672763b5faf5375de415de3bf4 (patch) | |
| tree | 2cc7c2a1ea2dbc055f39682f6293b2bcd65f7b6c /www/js | |
| parent | 92faf1cd858447e7e8d3db0a3b3d2396934c5e4b (diff) | |
#587 - option added to dev settings to make this configurable
Diffstat (limited to 'www/js')
| -rwxr-xr-x | www/js/DataModel.js | 8 | ||||
| -rw-r--r-- | www/js/EventCtrl.js | 8 | ||||
| -rw-r--r-- | www/js/MomentCtrl.js | 7 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 9 |
4 files changed, 30 insertions, 2 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 47ec1156..f63e6c8a 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -173,6 +173,7 @@ angular.module('zmApp.controllers') 'momentMonitorFilter': [], 'enableMomentSubMenu': true, 'momentArrangeBy': 'StartTime', + 'showLiveForInProgressEvents': true }; @@ -1052,6 +1053,13 @@ angular.module('zmApp.controllers') } + if (typeof loginData.showLiveForInProgressEvents == 'undefined') { + + loginData.showLiveForInProgressEvents = true; + + } + + diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index a2a3cec0..90eb90bf 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -2859,12 +2859,18 @@ angular.module('zmApp.controllers') $scope.currentEvent = event; $scope.followSameMonitor = ($stateParams.id == "0") ? "0" : "1"; + var ld = NVRDataModel.getLogin(); + var sl = 'disabled'; + if (ld.showLiveForInProgressEvents) { + sl = 'enabled'; + } + $ionicModal.fromTemplateUrl('templates/events-modal.html', { scope: $scope, animation: 'slide-in-up', id: 'footage', - showLive:'disabled', // seems bool is not allowed... + showLive:sl, // seems bool is not allowed... }) .then(function(modal) { diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js index abd41d53..97fcd6d4 100644 --- a/www/js/MomentCtrl.js +++ b/www/js/MomentCtrl.js @@ -575,10 +575,17 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ index: 1 }; + var ld = NVRDataModel.getLogin(); + var sl = 'disabled'; + if (ld.showLiveForInProgressEvents) { + sl = 'enabled'; + } + $ionicModal.fromTemplateUrl('templates/events-modal.html', { scope: $scope, animation: 'slide-in-up', id: 'footage', + showLive:sl, }) .then(function (modal) { $scope.modal = modal; diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 81db5991..a4a564d0 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -192,11 +192,18 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla //prepareModalEvent(event.Event.Id); + var ld = NVRDataModel.getLogin(); + var sl = 'disabled'; + if (ld.showLiveForInProgressEvents) { + sl = 'enabled'; + } + $ionicModal.fromTemplateUrl('templates/events-modal.html', { scope: $scope, // give ModalCtrl access to this scope animation: 'slide-in-up', - id: 'footage' + id: 'footage', + showLive:sl }) .then(function(modal) { |