diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/ModalCtrl.js | 123 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 3 |
2 files changed, 117 insertions, 9 deletions
diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js index 25bcbf5c..31ff2d2a 100644 --- a/www/js/ModalCtrl.js +++ b/www/js/ModalCtrl.js @@ -305,9 +305,34 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco $scope.onTapLeft = function (m,d) { - ZMDataModel.zmDebug("ModalCtrl:Left tap detected, moving to " + ZMDataModel.getNextMonitor(m, d)); - $scope.monitorId = ZMDataModel.getNextMonitor(m, d); + + var curstate = $ionicHistory.currentStateName(); + var found=0; + var mid; + mid = ZMDataModel.getNextMonitor(m, d); + if (curstate != "monitors") + { + do + { + mid = ZMDataModel.getNextMonitor(m, d); + m = mid; + found = 0; + for (var i = 0 ; i< $scope.monitors.length; i++) + { + if ($scope.monitors[i].Monitor.Id == mid && $scope.monitors[i].Monitor.listDisplay != 'noshow') + { + found = 1; + ZMDataModel.zmDebug("ModalCtrl: swipe detected, moving to " + mid); + break; + } + } + + } + while (found !=1); + } + + $scope.monitorId = mid; $ionicLoading.hide(); $ionicLoading.show({ @@ -321,8 +346,39 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco var ld = ZMDataModel.getLogin(); if (!ld.canSwipeMonitors) return; - ZMDataModel.zmDebug("ModalCtrl:Left swipe detected, moving to " + ZMDataModel.getNextMonitor(m, d)); - $scope.monitorId = ZMDataModel.getNextMonitor(m, d); + var curstate = $ionicHistory.currentStateName(); + var found=0; + var mid; + mid = ZMDataModel.getNextMonitor(m, d); + + if (curstate != "monitors") + { + + 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') + { + found = 1; + console.log (mid + "is part of the monitor list"); + ZMDataModel.zmDebug("ModalCtrl: swipe detected, moving to " + mid); + break; + } + } + + + } + while (found !=1); + } + + $scope.monitorId = mid; $ionicLoading.hide(); @@ -338,8 +394,35 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco $scope.onTapRight = function (m,d) { - ZMDataModel.zmDebug("ModalCtrl:Right tap detected, moving to " + ZMDataModel.getNextMonitor(m, d)); - $scope.monitorId = ZMDataModel.getNextMonitor(m, d); + //ZMDataModel.zmDebug("ModalCtrl:Right tap detected, moving to " + ZMDataModel.getNextMonitor(m, d)); + var found=0; + var mid; + var curstate = $ionicHistory.currentStateName(); + mid = ZMDataModel.getNextMonitor(m, d); + if (curstate != "monitors") + { + do + { + + mid = ZMDataModel.getNextMonitor(m, d); + m = mid; + found = 0; + for (var i = 0 ; i< $scope.monitors.length; i++) + { + if ($scope.monitors[i].Monitor.Id == mid && $scope.monitors[i].Monitor.listDisplay != 'noshow' ) + { + found = 1; + ZMDataModel.zmDebug("ModalCtrl: swipe detected, moving to " + mid); + break; + } + } + + + } + while (found !=1); + } + + $scope.monitorId = mid; $ionicLoading.show({ template: "please wait...", @@ -349,9 +432,33 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco }; $scope.onSwipeRight = function (m, d) { if (!ld.canSwipeMonitors) return; - ZMDataModel.zmDebug("ModalCtrl:Right swipe detected, moving to " + ZMDataModel.getNextMonitor(m, d)); - $scope.monitorId = ZMDataModel.getNextMonitor(m, d); + var found=0; + var mid; + var curstate = $ionicHistory.currentStateName(); + mid = ZMDataModel.getNextMonitor(m, d); + if (curstate != "monitors") + { + do + { + mid = ZMDataModel.getNextMonitor(m, d); + m = mid; + found = 0; + for (var i = 0 ; i< $scope.monitors.length; i++) + { + if ($scope.monitors[i].Monitor.Id == mid && $scope.monitors[i].Monitor.listDisplay != 'noshow') + { + found = 1; + ZMDataModel.zmDebug("ModalCtrl: swipe detected, moving to " + mid); + break; + } + } + + } + while (found !=1); + } + + $scope.monitorId = mid; $ionicLoading.show({ template: "please wait...", noBackdrop: true, diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 8d21ad8b..c3fe4cfd 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -396,6 +396,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' }; + /* $scope.onSwipeLeft = function ($index) { $scope.showSizeButtons = true; }; @@ -405,7 +406,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' $scope.showSizeButtons = false; }, 1000); - }; + };*/ //--------------------------------------------------------------------- // This marks a monitor as hidden in montage view |