summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/js/EventModalCtrl.js2
-rwxr-xr-xwww/js/app.js1
-rw-r--r--www/templates/events-modal.html4
3 files changed, 4 insertions, 3 deletions
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 @@
<div ng-controller="EventModalCtrl">
<!-- style="width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;"-->
<ion-modal-view cache-view="false">
- <ion-content style="background-color:#444444" ng-cloak>
+ <ion-content style="background-color:#000000" ng-cloak>
<!-- alarm frames in snapshot-->
@@ -69,7 +69,7 @@
<!-- <div style="max-width:100%; max-height:100%;" on-swipe-left="onSwipeEvent(nextId,1)" on-swipe-right="onSwipeEvent(prevId,-1)" > -->
- <div on-swipe-left="onSwipeEvent(nextId,1)" on-swipe-right="onSwipeEvent(prevId,-1)" ng-style="{'height':$root.devHeight+'px', 'width':$root.devWidth+'px'}">
+ <div on-swipe-left="onSwipeEvent(nextId,1)" on-swipe-right="onSwipeEvent(prevId,-1)" ng-style="{'height':$root.videoHeight+'px', 'width':$root.devWidth+'px'}">
<videogular id="testaut_events_playwindow" vg-can-play="onCanPlay()" vg-native-fullscreen="videoObject.config.nativeFullScreen"
vg-player-ready="onPlayerReady($API)"