diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-12-21 10:24:05 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-12-21 10:24:05 -0500 |
| commit | a18aa84429258413b0e7adcd6c211f243ebefcf2 (patch) | |
| tree | fc2d7611e0c02562c63e7f836b1da3cf6e023620 /www/js/EventModalCtrl.js | |
| parent | 71860e6fda10e4772fad034ba036e1b66198a17c (diff) | |
#766 - wait for rotation to complete or width/height will be wrong
Diffstat (limited to 'www/js/EventModalCtrl.js')
| -rw-r--r-- | www/js/EventModalCtrl.js | 5 |
1 files changed, 3 insertions, 2 deletions
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: [{ |