diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2017-12-20 12:20:54 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2017-12-20 12:20:54 -0500 |
| commit | 7482599ccaf95c7a23ca2118052c53775a0514d5 (patch) | |
| tree | bbc6300a0a892e734e91d97337405aabb6b6aeae /www/js | |
| parent | d2eef84479c99e11f01927ffe119a20669f3c450 (diff) | |
#570 removed paddings, also added pinning capability for collapse
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/EventModalCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/MomentCtrl.js | 18 |
2 files changed, 17 insertions, 3 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index a450fe80..73f45474 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -968,7 +968,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro NVRDataModel.log(">>>Modal was exited, not starting checkAllEvents"); } - }, 5000); + }, 2000); } } diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js index c5300d0e..d4eceb7f 100644 --- a/www/js/MomentCtrl.js +++ b/www/js/MomentCtrl.js @@ -115,6 +115,8 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ var mid = data.events[i].Event.MonitorId; data.events[i].Event.order = i; + data.events[i].Event.pinned = false; + data.events[i].Event.pinnedIcon = "ion-pin"; // console.log ("---> PUSHING "+data.events[i].Event.StartTime); moments.push(data.events[i]); @@ -234,6 +236,18 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ }; + $scope.togglePin =function(ndx) { + $scope.moments[ndx].Event.pinned = !$scope.moments[ndx].Event.pinned; + if ($scope.moments[ndx].Event.pinned) { + $scope.moments[ndx].Event.pinnedIcon ="animated infinite flash ion-pin"; + } + else { + $scope.moments[ndx].Event.pinnedIcon ="ion-pin"; + + } + + + }; // When a user taps on collapse on an eid, // all events after that for the same monitor should be collapsed @@ -260,7 +274,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ } for (var i = ndx+1; i < $scope.moments.length; i++ ) { - if ($scope.moments[i].Event.MonitorId == mid) { + if ($scope.moments[i].Event.MonitorId == mid && !$scope.moments[i].Event.pinned ) { $scope.moments[i].Event.hide = hide; $scope.moments[i].Event.icon = "ion-code-working"; $scope.moments[i].Event.collapseCount = ""; @@ -394,7 +408,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ itemSelector: '.grid-item', // columnWidth: 10 horizontalOrder: true, - gutter: 2, + gutter: 0, initLayout: true, percentPosition: true, |