#138 - more fixes

Former-commit-id: d06e1d9804a28c6b6ccd55a5cc65d51105d667e4

1 files changed, 32 insertions, 20 deletions

diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js
index b95beb34..252ee953 100644
--- a/www/js/ModalCtrl.js
+++ b/www/js/ModalCtrl.js
@@ -441,30 +441,42 @@ $scope.togglePresets = function()
         var mid;
         mid = ZMDataModel.getNextMonitor(m, d);
 
-        if (curstate != "monitors") {
-
-            // FIXME: clean this up - in a situation where
-            // no monitors are enabled, will it loop for ever?
-            do {
-                mid = ZMDataModel.getNextMonitor(m, d);
-                m = mid;
-                console.log("Next Monitor is " + m);
-
-
-                found = 0;
-                for (var i = 0; i < $scope.monitors.length; i++) {
-                    if ($scope.monitors[i].Monitor.Id == mid && $scope.monitors[i].Monitor.listDisplay != 'noshow' && $scope.monitors[i].Monitor.Function !='None' && $scope.monitors[i].Monitor.Enabled != '0') {
-                        found = 1;
-                        console.log(mid + "is part of the monitor list");
-                        ZMDataModel.zmDebug("ModalCtrl: swipe detected, moving to " + mid);
-                        break;
-                    }
-                }
+    
 
+        // FIXME: clean this up - in a situation where
+        // no monitors are enabled, will it loop for ever?
+        do {
+            mid = ZMDataModel.getNextMonitor(m, d);
+            m = mid;
+            console.log("Next Monitor is " + m);
+
+
+            found = 0;
+            for (var i = 0; i < $scope.monitors.length; i++) {
+                if ($scope.monitors[i].Monitor.Id == mid &&
+                    // if you came from monitors, then ignore noshow
+                    ($scope.monitors[i].Monitor.listDisplay != 'noshow' || curstate == "monitors" ) &&
+                    $scope.monitors[i].Monitor.Function !='None' &&
+                    $scope.monitors[i].Monitor.Enabled != '0') {
+                    found = 1;
+                    console.log(mid + "is part of the monitor list");
+                    ZMDataModel.zmDebug("ModalCtrl: swipe detected, moving to " + mid);
+                    break;
+                }
 
+                else 
+                {
+                    ZMDataModel.zmDebug ("skipping " + $scope.monitors[i].Monitor.Id + 
+                                         " listDisplay="+$scope.monitors[i].Monitor.listDisplay+
+                                         " Function="+$scope.monitors[i].Monitor.Function+
+                                         " Enabled="+ $scope.monitors[i].Monitor.Enabled);
+                }
             }
-            while (found != 1);
+
+
         }
+        while (found != 1);
+        
 
         var slidein;
         var slideout;