diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2016-01-12 16:20:05 +0530 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2016-01-12 16:20:05 +0530 |
| commit | 9d00e4bd31d05947fc79b7595f5e21a8f9deef77 (patch) | |
| tree | 6719400dd9cb8c0d84b96b0198f017c0ee76db74 /www/js/ModalCtrl.js | |
| parent | 9b51c9806c4264ce2bce4e2aefac0089c6cfe7c9 (diff) | |
#138 skip None as well as disabled
Former-commit-id: 7a8e1b09d2f751f2358e450857745d174aeab182
Diffstat (limited to 'www/js/ModalCtrl.js')
| -rw-r--r-- | www/js/ModalCtrl.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js index 854adcf1..b95beb34 100644 --- a/www/js/ModalCtrl.js +++ b/www/js/ModalCtrl.js @@ -443,6 +443,8 @@ $scope.togglePresets = function() 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; @@ -451,7 +453,7 @@ $scope.togglePresets = function() 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') { + 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); |