summaryrefslogtreecommitdiff
path: root/www/js/MonitorCtrl.js
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-04-25 11:19:09 -0400
committerpliablepixels <pliablepixels@gmail.com>2016-04-25 11:19:09 -0400
commitd77857a5789dc907ab8c7c578a2a24e8155add52 (patch)
treeb0e9185127f710a2e10cc1906997f6e2fa333189 /www/js/MonitorCtrl.js
parente7f2da043d19c1adb5d389c383dc8b1779ed0227 (diff)
#232 undid client side hacks - this needs to be fixed at ZMS, follow the discussion here https://github.com/ZoneMinder/ZoneMinder/issues/1431
Former-commit-id: a5b57378d2fca9bcbc3966ed182a81ccebc84983
Diffstat (limited to 'www/js/MonitorCtrl.js')
-rw-r--r--www/js/MonitorCtrl.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index 26bcade0..1fb24a67 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -287,7 +287,7 @@ angular.module('zmApp.controllers')
// console.log("**VIEW ** Monitor Ctrl Unloaded");
});
- $scope.openModal = function (mid, controllable, controlid, connKey, orient) {
+ $scope.openModal = function (mid, controllable, controlid, connKey, monitor) {
ZMDataModel.zmDebug("MonitorCtrl:Open Monitor Modal with monitor Id=" + mid +
" and Controllable:" + controllable + " with control ID:" + controlid);
@@ -296,7 +296,7 @@ angular.module('zmApp.controllers')
$scope.monitorName = ZMDataModel.getMonitorName(mid);
$scope.LoginData = ZMDataModel.getLogin();
$scope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
- $scope.orientation = orient || '0';
+ $scope.refMonitor = monitor;
ZMDataModel.zmLog("Monitor Orientation is: " + $scope.orientation);
$rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;