From 2ee1fa1581db8fdbe0c9ba954c13cfda9d41a6c3 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 23 Feb 2020 16:49:09 -0500 Subject: #897 make sure scrub bar doesn't get too close to iphoneX home bar --- config.xml | 4 ++-- package.json | 4 ++-- www/js/EventModalCtrl.js | 2 +- www/js/app.js | 1 + www/templates/events-modal.html | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/config.xml b/config.xml index 609e98b0..dddaac4e 100644 --- a/config.xml +++ b/config.xml @@ -175,9 +175,9 @@ - - + + diff --git a/package.json b/package.json index 4f79fb2d..58456fcb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version":"1.3.089", + "version": "1.3.089", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -213,4 +213,4 @@ ] } } -} +} \ No newline at end of file diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 176a91cf..13e20ecb 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -2141,7 +2141,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $scope.videoObject = { config: { autoPlay: true, - responsive: false, + responsive: true, nativeControls: false, nativeFullScreen: true, diff --git a/www/js/app.js b/www/js/app.js index 73b50511..57f32aa2 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -1471,6 +1471,7 @@ angular.module('zmApp', [ $rootScope.pixelRatio = pixelRatio; $rootScope.devWidth = ((window.innerWidth > 0) ? window.innerWidth : screen.width); $rootScope.devHeight = ((window.innerHeight > 0) ? window.innerHeight : screen.height); + $rootScope.videoHeight = $rootScope.devHeight - 20; NVR.debug("resize/orient: " + $rootScope.devWidth + "(w) * " + $rootScope.devHeight+"(h)"); diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index be971b52..cd34bb0e 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -1,7 +1,7 @@
- + @@ -69,7 +69,7 @@ -
+