summaryrefslogtreecommitdiff
path: root/www/js/MontageCtrl.js
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-04-24 09:45:52 -0400
committerpliablepixels <pliablepixels@gmail.com>2016-04-24 09:45:52 -0400
commitcc97290133abd5a6b141f4ea526bdf0bf261076c (patch)
tree86d728cc27f32fe88e418e59aaedd1e1d1152d08 /www/js/MontageCtrl.js
parentd87f742ca19a6983831ec6d26ef1385c54292877 (diff)
#232 - pass on orientation value to modal so we can rotate
Former-commit-id: 6169275f480e0166dcd19cd469c6e0452befdf0a
Diffstat (limited to 'www/js/MontageCtrl.js')
-rw-r--r--www/js/MontageCtrl.js4
1 files changed, 3 insertions, 1 deletions
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