From a18aa84429258413b0e7adcd6c211f243ebefcf2 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 21 Dec 2018 10:24:05 -0500 Subject: #766 - wait for rotation to complete or width/height will be wrong --- www/js/EventModalCtrl.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'www/js/EventModalCtrl.js') diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 50da86d4..ce39e827 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -1124,9 +1124,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $ionicLoading.hide(); if (m.id != 'footage') - return; + $ionicSideMenuDelegate.canDragContent(false); showLive = true; if (m.snapshot == 'enabled') { @@ -1295,6 +1295,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $scope.$on('modal.removed', function (e, m) { + $ionicSideMenuDelegate.canDragContent(true); if ($rootScope.platformOS == 'desktop') { NVRDataModel.debug("Removing keyboard handler"); window.removeEventListener('keydown', keyboardHandler, true); @@ -2069,7 +2070,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro autoPlay: true, responsive: false, nativeControls: false, - nativeFullScreen: false, + nativeFullScreen: true, playsInline: true, sources: [{ -- cgit v1.2.3