summaryrefslogtreecommitdiff
path: root/www/js/EventModalCtrl.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@users.noreply.github.com>2019-11-08 11:27:05 -0500
committerGitHub <noreply@github.com>2019-11-08 11:27:05 -0500
commitb749cce31e8bb7cd0fce52c1a08155a7cb0ffcb9 (patch)
tree14fd72b4a49d124ee665a3624b5c01dfdfe6dbb0 /www/js/EventModalCtrl.js
parent140b1ef1a7b110178aebe17334353fa803d2ede7 (diff)
parent1835c49416d8c7403f153792fbebd2987d88b201 (diff)
Merge pull request #858 from pliablepixels/faster_montage_loads
Faster montage loads & Timeline fixes
Diffstat (limited to 'www/js/EventModalCtrl.js')
-rw-r--r--www/js/EventModalCtrl.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 92eae748..6741eecf 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1257,7 +1257,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
$scope.$on('modal.removed', function (e, m) {
- $ionicSideMenuDelegate.canDragContent(true);
+ if (!m.disableDrag )
+ $ionicSideMenuDelegate.canDragContent(true);
if ($rootScope.platformOS == 'desktop') {
NVR.debug("Removing keyboard handler");
window.removeEventListener('keydown', keyboardHandler, true);