summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorArjun Roychowdhury <pliablepixels@gmail.com>2016-01-12 10:28:43 +0530
committerArjun Roychowdhury <pliablepixels@gmail.com>2016-01-12 10:28:43 +0530
commit9b51c9806c4264ce2bce4e2aefac0089c6cfe7c9 (patch)
tree36ce7e716e0558b412c25b8919d485cd0b73a8f5 /www/js
parentbb790a6e1bc80303c83825ebea61a3966c7e4d9f (diff)
#138 - skip if monitor is also disabled at ZM
Former-commit-id: be0aacb6e6ac8516b6059305b9d902207e1dda4b
Diffstat (limited to 'www/js')
-rw-r--r--www/js/ModalCtrl.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js
index b61fe300..854adcf1 100644
--- a/www/js/ModalCtrl.js
+++ b/www/js/ModalCtrl.js
@@ -451,7 +451,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') {
+ if ($scope.monitors[i].Monitor.Id == mid && $scope.monitors[i].Monitor.listDisplay != 'noshow' && $scope.monitors[i].Monitor.Function !='None') {
found = 1;
console.log(mid + "is part of the monitor list");
ZMDataModel.zmDebug("ModalCtrl: swipe detected, moving to " + mid);