diff options
| author | Pliable Pixels <pliablepixels@users.noreply.github.com> | 2016-08-22 10:27:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-22 10:27:14 -0400 |
| commit | d8ffac85ff300d41e668904da8a6dc897e784be9 (patch) | |
| tree | b4387e669780d2e22fc5f80e17747ce4e2bcc4ed /www/js | |
| parent | 71045ed744f17d645c69295fc849e5cb4ab9b866 (diff) | |
| parent | 42e8639458ab943a75d29d50621820a34622d8a7 (diff) | |
Merge pull request #309 from pliablepixels/revert-307-master
Revert "Added Wake-Sleep-Reset control commands"
Former-commit-id: 7ae4eb211d7ad0d45613f2ce97920b09950fe599
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MonitorCtrl.js | 7 | ||||
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 21 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 7 |
3 files changed, 3 insertions, 32 deletions
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 |