diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-08-22 10:20:53 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-08-22 10:20:53 -0400 |
| commit | cadc7089e5bce6e68f0802691d6f5c07e69b888d (patch) | |
| tree | d297ef66b7e8e0bbca02f771d7991c7379247da6 /www/js | |
| parent | b44794550eb4fc460cdddfca48de210408642363 (diff) | |
#306 - convert W/S/R buttons to elements of list for easier formatting - no overlaps
Former-commit-id: 641f3adb825f3a5dde457416ba417381b54e2322
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index e51f5af3..cbfa972d 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -1052,17 +1052,31 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ .success (function (data) { $scope.isControllable = data.monitor.Monitor.Controllable; + + // *** Only for testing - comment out // + //$scope.isControllable = '1'; // for testing only // $scope.isControllable = 1; $scope.controlid = data.monitor.Monitor.ControlId; - if ($scope.isControllable=='1') + if ($scope.isControllable=='1' ) { + + var apiurl = ZMDataModel.getLogin().apiurl; var myurl = apiurl + "/controls/" + $scope.controlid + ".json"; ZMDataModel.zmDebug("configurePTZ : getting controllable data " + myurl); $http.get(myurl) .success(function (data) { + + // *** Only for testing - comment out - start// + /*data.Control.Control.CanSleep = '1'; + data.Control.Control.CanWake = '1'; + data.Control.Control.CanReset = '1'; + data.Control.Control.CanZoom = '1'; + data.control.Control.HasPresets = '1'; + data.control.Control.HasHomePreset = '1';*/ + // *** Only for testing - comment out - end // if (data.control.Control.CanWake == '1') { @@ -1146,8 +1160,29 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ if (data.control.Control.HasHomePreset == '1') { $scope.ptzPresets.unshift({name:'', icon:"ion-ios-home", cmd:'presetHome'}); + + } + + // lets add these to the end + // strictly speaking, they aren't really presets, but meh for now + + if (data.control.Control.CanWake == '1') + { - $scope.ptzPresetCount++; + $scope.ptzPresets.push({name:'', icon:"ion-eye", cmd:'wake'}); + + } + + if (data.control.Control.CanSleep == '1') + { + $scope.ptzPresets.push({name:'', icon:"ion-eye-disabled", cmd:'sleep'}); + + } + + if (data.control.Control.CanReset == '1') + { + $scope.ptzPresets.push({name:'', icon:"ion-ios-loop-strong", cmd:'reset'}); + } } |