summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliablePixels <pliablepixels@gmail.com>2015-07-26 17:01:24 -0400
committerPliablePixels <pliablepixels@gmail.com>2015-07-26 17:01:24 -0400
commit2790abd92fcb544187e11884215a75bff3cc3c83 (patch)
tree154cd446946fb08287e560f8198b33aa4100e747
parentcee8c7c15a4d67af6658fdf98fa444fddf32c121 (diff)
disabled menu drag when scrub is on
-rw-r--r--www/js/EventCtrl.js2
1 files changed, 2 insertions, 0 deletions
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();