From 2b51690e5a5dec4d1925ca3090ad75e00991443b Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Thu, 5 Nov 2015 13:25:22 -0500 Subject: #66 - if you are zoomed in, swipe to next monitor/event will be disabled --- www/js/EventCtrl.js | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'www/js/EventCtrl.js') diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index a4da30dc..42c96118 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1251,6 +1251,14 @@ angular.module('zmApp.controllers') { var ld = ZMDataModel.getLogin(); if (!ld.canSwipeMonitors) return; + + if + ($ionicScrollDelegate.$getByHandle("imgscroll").getScrollPosition().zoom!=1) + { + console.log("Image is zoomed in - not honoring swipe"); + return; + } + jumpToEvent(eid,dirn); }; -- cgit v1.2.3