From 42e8639458ab943a75d29d50621820a34622d8a7 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 22 Aug 2016 10:26:39 -0400 Subject: Revert "Added Wake-Sleep-Reset control commands" Former-commit-id: bd9563286cf4ac6c56a9cddb71f53f6cf1d0fda5 --- www/js/MonitorCtrl.js | 7 +------ www/js/MonitorModalCtrl.js | 21 +-------------------- www/js/MontageCtrl.js | 7 +------ 3 files changed, 3 insertions(+), 32 deletions(-) (limited to 'www/js') diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js index 900084cb..97110760 100644 --- a/www/js/MonitorCtrl.js +++ b/www/js/MonitorCtrl.js @@ -346,11 +346,6 @@ angular.module('zmApp.controllers') $scope.LoginData = ZMDataModel.getLogin(); $rootScope.modalRand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; - - $scope.ptzWakeCommand = ""; - $scope.ptzSleepCommand = ""; - $scope.ptzResetCommand = ""; - $scope.ptzMoveCommand = ""; $scope.ptzStopCommand = ""; @@ -498,4 +493,4 @@ angular.module('zmApp.controllers') }; -}]); +}]); \ No newline at end of file diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index e51f5af3..e4912294 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -1031,10 +1031,6 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ // function configurePTZ(mid) { - $scope.ptzWakeCommand = ""; - $scope.ptzSleepCommand = ""; - $scope.ptzResetCommand = ""; - $scope.ptzMoveCommand = ""; $scope.ptzStopCommand = ""; @@ -1064,21 +1060,6 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ $http.get(myurl) .success(function (data) { - if (data.control.Control.CanWake == '1') - { - $scope.ptzWakeCommand = 'wake'; - } - - if (data.control.Control.CanSleep == '1') - { - $scope.ptzSleepCommand = 'sleep'; - } - - if (data.control.Control.CanReset == '1') - { - $scope.ptzResetCommand = 'reset'; - } - $scope.ptzMoveCommand = "move"; // start with as move; $scope.ptzStopCommand = ""; @@ -1193,4 +1174,4 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ }); -}]); +}]); \ No newline at end of file diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index c5ba05bd..6d93e753 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -664,11 +664,6 @@ function initPackery() $scope.LoginData = ZMDataModel.getLogin(); $rootScope.modalRand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; - - $scope.ptzWakeCommand = ""; - $scope.ptzSleepCommand = ""; - $scope.ptzResetCommand = ""; - $scope.ptzMoveCommand = ""; $scope.ptzStopCommand = ""; @@ -1159,4 +1154,4 @@ $scope.$on('$ionicView.afterEnter', function () { }; -}]); +}]); \ No newline at end of file -- cgit v1.2.3