From 84b05d931168df5eade1a5ca3c9dc0b303d98384 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 4 Jul 2016 17:27:18 -0400
Subject: #278 - go directly to live view via monitors (avoid packery jugglery
 in montage). Pending - set value of tappedMid

Former-commit-id: 7805e086656ae4f05ee4af97d325f0e2b87f999a
---
 www/js/MontageCtrl.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'www/js/MontageCtrl.js')

diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 09353ea9..2fa976b3 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -638,7 +638,13 @@ function initPackery()
     //---------------------------------------------------------------------
     // main monitor modal open - if drag is not on, this is called on touch
     //---------------------------------------------------------------------
-    $scope.openModal = function (mid, controllable, controlid, connKey, monitor) {
+    
+    $scope.openModal = function (mid, controllable, controlid, connKey, monitor)
+    {
+        openModal  (mid, controllable, controlid, connKey, monitor);
+    };
+    
+   function openModal(mid, controllable, controlid, connKey, monitor) {
         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
@@ -703,7 +709,7 @@ function initPackery()
 
             });
 
-    };
+    }
 
     //---------------------------------------------------------------------
     //
@@ -811,6 +817,10 @@ $scope.$on ('$ionicView.beforeEnter', function() {
     $scope.minimal = $stateParams.minimal;
     //console.log ("**************** MINIMAL ENTER " + $scope.minimal);
     $scope.zmMarginTop = $scope.minimal ? 0 : 15;
+    
+    
+    
+    
 });
     
 
@@ -921,6 +931,9 @@ $scope.$on('$ionicView.afterEnter', function () {
         $timeout ( function () {initPackery(); },500);
         document.addEventListener("pause", onPause, false);
         document.addEventListener("resume", onResume, false);
+    
+       
+        
 
 });
     
@@ -946,6 +959,7 @@ $scope.$on('$ionicView.afterEnter', function () {
         
     });
     
+    
    
 
     $scope.$on('$ionicView.unloaded', function () {
-- 
cgit v1.2.3