From 9b51c9806c4264ce2bce4e2aefac0089c6cfe7c9 Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Tue, 12 Jan 2016 10:28:43 +0530 Subject: #138 - skip if monitor is also disabled at ZM Former-commit-id: be0aacb6e6ac8516b6059305b9d902207e1dda4b --- www/js/ModalCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/js') 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); -- cgit v1.2.3