diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2017-02-06 03:59:32 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2017-02-06 03:59:32 -0500 |
| commit | 1c4c12af513ae9208ce92d34e1557e143ed8f0ef (patch) | |
| tree | bbe6028e551af4b18a8e46b95bc1c373e595e40a /www/js | |
| parent | e2c87f9bb24181b1a9daffd7892c4666479b8a19 (diff) | |
minor release tweaks
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 9 | ||||
| -rw-r--r-- | www/js/MontageHistoryCtrl.js | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index a41cb04d..4d2abd63 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -1416,7 +1416,9 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ $scope.toggleListMenu = function() { + $scope.isToggleListMenu = !$scope.isToggleListMenu; + //console.log ("isToggleListMenu:"+$scope.isToggleListMenu); }; //------------------------------------------------------------- @@ -1691,14 +1693,15 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ $scope.monStatus = ""; $scope.isToggleListMenu = true; + //console.log (">>>>>>>>>>>>>>>>>>>STOOOP"); document.addEventListener("pause", onPause, false); document.addEventListener("resume", onResume, false); - document.addEventListener("mouseup", moveStop, false); + /*document.addEventListener("mouseup", moveStop, false); document.addEventListener("touchend", moveStop, false); - document.addEventListener("mousemove", moveContinue, false); - document.addEventListener("touchmove", moveContinue, false); + document.addEventL`istener("mousemove", moveContinue, false); + document.addEventListener("touchmove", moveContinue, false);*/ diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 4c7851d5..8aff342e 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -292,6 +292,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc { mid = data.events[i].Event.MonitorId; eid = data.events[i].Event.Id; + //console.log ("Event ID:"+eid); stime = data.events[i].Event.StartTime; // only take the first one for each monitor for (var j = 0; j < $scope.MontageMonitors.length; j++) |