diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MonitorCtrl.js | 4 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js index 7b637b1c..26bcade0 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) { + $scope.openModal = function (mid, controllable, controlid, connKey, orient) { ZMDataModel.zmDebug("MonitorCtrl:Open Monitor Modal with monitor Id=" + mid + " and Controllable:" + controllable + " with control ID:" + controlid); @@ -296,6 +296,8 @@ 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'; + ZMDataModel.zmLog("Monitor Orientation is: " + $scope.orientation); $rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 869117f5..6cc20d65 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -628,7 +628,7 @@ function initPackery() //--------------------------------------------------------------------- // main monitor modal open - if drag is not on, this is called on touch //--------------------------------------------------------------------- - $scope.openModal = function (mid, controllable, controlid, connKey) { + $scope.openModal = function (mid, controllable, controlid, connKey, orient) { ZMDataModel.zmDebug("MontageCtrl: Open Monitor Modal with monitor Id=" + mid + " and Controllable:" + controllable + " with control ID:" + controlid); // $scope.isModalActive = true; // Note: no need to setAwake(true) as its already awake @@ -664,6 +664,8 @@ function initPackery() $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); $scope.isControllable = controllable; + $scope.orientation = orient || '0'; + ZMDataModel.zmLog("Monitor Orientation is: " + $scope.orientation); // This is a modal to show the monitor footage // We need to switch to always awake if set so the feed doesn't get interrupted |