From 2790abd92fcb544187e11884215a75bff3cc3c83 Mon Sep 17 00:00:00 2001 From: PliablePixels Date: Sun, 26 Jul 2015 17:01:24 -0400 Subject: disabled menu drag when scrub is on --- www/js/EventCtrl.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'www/js') diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 911a97c1..1f535507 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -248,6 +248,7 @@ angular.module('zmApp.controllers') if (event.Event.ShowScrub==true) // turn on display now { //$ionicScrollDelegate.freezeScroll(true); + $ionicSideMenuDelegate.canDragContent(false); $scope.slider_options = { from:1, to:event.Event.Frames, @@ -345,6 +346,7 @@ angular.module('zmApp.controllers') else { // $ionicScrollDelegate.freezeScroll(false); + $ionicSideMenuDelegate.canDragContent(true); event.Event.height=zm.eventsListDetailsHeight; $ionicScrollDelegate.resize(); -- cgit v1.2.3