mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-12 00:31:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZoneMinder/zoneminder

Browse Source
This commit is contained in:
Isaac Connor
2023-02-07 09:00:49 -05:00
parent 2884afdef5 a592dfb8aa
commit 6281cbc623
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web/skins/classic/views/event.php
View File

@@ -258,6 +258,11 @@ if ($video_tag) {
<track id="monitorCaption" kind="captions" label="English" srclang="en" src='data:plain/text;charset=utf-8,"WEBVTT\n\n 00:00:00.000 --> 00:00:01.000 ZoneMinder"' default/>
Your browser does not support the video tag.
</video>
<div id="progressBar" style="width: 100%;">
<div id="alarmCues" style="width: 100%;"></div>
<div class="progressBox" id="progressBox" title="" style="width: 0%;"></div>
<div id="indicator" style="display: none;"></div>
</div><!--progressBar-->
<?php
} else {
if ( (ZM_WEB_STREAM_METHOD == 'mpeg') && ZM_MPEG_LIVE_FORMAT ) {
@@ -275,7 +280,7 @@ if ( (ZM_WEB_STREAM_METHOD == 'mpeg') && ZM_MPEG_LIVE_FORMAT ) {
} // end if stream method
?>
<div id="progressBar" style="width: 100%;">
<div id="alarmCues" style="width: 100%;"></div>
<div id="alarmCues" style="width: 100%;"></div>
<div class="progressBox" id="progressBox" title="" style="width: 0%;"></div>
<div id="indicator" style="display: none;"></div>
</div><!--progressBar-->

4
web/skins/classic/views/js/event.js
View File

@@ -310,7 +310,7 @@ function getCmdResponse(respObj, respText) {
}
if (streamStatus.progress > parseFloat(eventData.Length)) {
console.log("Limiting progress to " + streamStatus.progress + ' >= ' + parseFloat(eventData.Length) );
streamStatus.progress = parseFloat(eventData.Length);
//streamStatus.progress = parseFloat(eventData.Length);
} //Limit progress to reality
var eventId = streamStatus.event;
@@ -1004,7 +1004,7 @@ function initPage() {
if (document.getElementById('videoobj')) {
vid = videojs('videoobj');
addVideoTimingTrack(vid, LabelFormat, eventData.MonitorName, eventData.Length, eventData.StartDateTime);
$j('.vjs-progress-control').append('<div id="alarmCues" class="alarmCues"></div>');//add a place for videojs only on first load
//$j('.vjs-progress-control').append('<div id="alarmCues" class="alarmCues"></div>');//add a place for videojs only on first load
vid.on('ended', vjsReplay);
vid.on('play', vjsPlay);
vid.on('pause', pauseClicked);