ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

only update changed elements in video view

pull/3054/head
Andrew Bauer 2020-10-05 13:59:44 -05:00
parent 71085d9724
commit 321de3c604
2 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
web/skins/classic/views/js/video.js
View File

@ -8,29 +8,27 @@ function downloadVideo(e) {
window.location.replace(thisUrl+'?view='+currentView+'&eid='+eventId+'&downloadIndex='+index);
}
var generateVideoTimer = null;
function generateVideoResponse( data, responseText ) {
console.log(data);
function generateVideoProgress() {
var tickerText = $j('#videoProgressTicker').text();
if ( tickerText.length < 1 || tickerText.length > 4 ) {
$j('#videoProgressTicker').text('.');
var generated = (data.result=='Ok') ? 1 : 0;
var fullUrl = thisUrl + '?view=' + currentView + '&eid=' + eventId + '&generated=' + generated;
$j('#videoProgress').removeClass( 'text-warning' );
if ( generated ) {
$j('#videoProgress').addClass( 'text-success' );
$j('#videoProgress').text(exportSucceededString);
$j( "#videoTable" ).load( fullUrl+ ' #videoTable' );
} else {
$j('videoProgressTicker').append('.');
$j('#videoProgress').addClass( 'text-danger' );
$j('#videoProgress').text(exportFailedString);
}
}
function generateVideoResponse( respObj, respText ) {
window.location.replace(thisUrl+'?view='+currentView+'&eid='+eventId+'&generated='+((respObj.result=='Ok')?1:0));
}
function generateVideo() {
var form = $j('#videoForm').serialize();
$j.getJSON(thisUrl + '?view=request&request=event&action=video', form)
.done(generateVideoResponse)
.fail(logAjaxFail);
$j('#videoProgress').removeClass('hidden');
$j('#videoProgress').addClass('warnText');
$j('#videoProgressText').text(videoGenProgressString);
generateVideoProgress();
generateVideoTimer = generateVideoProgress.periodical(500);
$j('#videoProgress').removeClass('invisible');
}

21
web/skins/classic/views/video.php
View File

@ -148,23 +148,10 @@ if ( isset($_REQUEST['showIndex']) ) {
<?php echo translate('GenerateVideo') ?>
</button>
</form>
<?php
if ( isset($_REQUEST['generated']) ) {
?>
<h2 id="videoProgress" class="<?php echo $_REQUEST['generated']?'infoText':'errorText' ?>">
<span id="videoProgressText"><?php echo $_REQUEST['generated']?translate('VideoGenSucceeded'):translate('VideoGenFailed') ?></span>
<span id="videoProgressTicker"></span>
<h2 id="videoProgress" class="text-warning invisible">
<span class="spinner-grow" role="status" aria-hidden="true"></span>
<?php echo translate('GeneratingVideo') ?>
</h2>
<?php
} else {
?>
<h2 id="videoProgress" class="hidden warnText">
<span id="videoProgressText"><?php echo translate('GeneratingVideo') ?></span>
<span id="videoProgressTicker"></span>
</h2>
<?php
}
?>
<h2 id="videoFilesHeader"><?php echo translate('VideoGenFiles') ?></h2>
<?php
if ( count($videoFiles) == 0 ) {
@ -210,7 +197,7 @@ if ( isset($_REQUEST['showIndex']) ) {
<td><?php echo $rateText ?></td>
<td><?php echo $scaleText ?></td>
<td>
<?php echo makePopupLink('?view='.$view.'&amp;eid='.$event->Id().'&amp;width='.$width.'&amp;height='.$height.'&amp;showIndex='.$index, 'zmVideo'.$event->Id().'-'.$scale, array('videoview', $width, $height), translate('View') ); ?>
<?php echo makeLink('?view='.$view.'&amp;eid='.$event->Id().'&amp;width='.$width.'&amp;height='.$height.'&amp;showIndex='.$index, translate('View') ); ?>
&nbsp;/&nbsp;
<a href="#"
data-on-click-this="downloadVideo" data-file-index="<?php echo $index ?>"><?php echo translate('Download') ?></a>