summaryrefslogtreecommitdiff
path: root/www/js/EventCtrl.js
diff options
context:
space:
mode:
authorArjun Roychowdhury <pliablepixels@gmail.com>2015-11-05 13:25:22 -0500
committerArjun Roychowdhury <pliablepixels@gmail.com>2015-11-05 13:25:22 -0500
commit2b51690e5a5dec4d1925ca3090ad75e00991443b (patch)
treed96c471061487a3da57c4ed72cb2b30dd633c0a2 /www/js/EventCtrl.js
parentd14b5640b5df95397f12f7b0d09e20631102aa63 (diff)
#66 - if you are zoomed in, swipe to next monitor/event will be disabled
Diffstat (limited to 'www/js/EventCtrl.js')
-rw-r--r--www/js/EventCtrl.js8
1 files changed, 8 insertions, 0 deletions
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);
};