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

Cleanup vjsReplay

pull/2077/head
digital-gnome 2017-11-11 11:10:54 -05:00
parent f08e75c598
commit 21949f5426
1 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,7 @@
var vid = null; var vid = null;
function vjsReplay() { function vjsReplay() {
vid.ready(function(){ let endTime = (Date.parse(eventData.EndTime)).getTime();
var player = this;
player.on('ended', function() {
var endTime = (Date.parse(eventData.EndTime)).getTime();
switch(replayMode.value) { switch(replayMode.value) {
case 'none': case 'none':
break; break;
@ -16,7 +13,7 @@ function vjsReplay() {
let overLaid = $j("#videoobj"); let overLaid = $j("#videoobj");
overLaid.append('<p class="vjsMessage" style="height: '+overLaid.height()+'px; line-height: '+overLaid.height()+'px;">No more events</p>'); overLaid.append('<p class="vjsMessage" style="height: '+overLaid.height()+'px; line-height: '+overLaid.height()+'px;">No more events</p>');
} else { } else {
var nextStartTime = nextEventStartTime.getTime(); //nextEventStartTime.getTime() is a mootools workaround, highjacks Date.parse let nextStartTime = nextEventStartTime.getTime(); //nextEventStartTime.getTime() is a mootools workaround, highjacks Date.parse
if (nextStartTime <= endTime) { if (nextStartTime <= endTime) {
streamNext( true ); streamNext( true );
return; return;
@ -24,11 +21,11 @@ function vjsReplay() {
let overLaid = $j("#videoobj"); let overLaid = $j("#videoobj");
vid.pause(); vid.pause();
overLaid.append('<p class="vjsMessage" style="height: '+overLaid.height()+'px; line-height: '+overLaid.height()+'px;"></p>'); overLaid.append('<p class="vjsMessage" style="height: '+overLaid.height()+'px; line-height: '+overLaid.height()+'px;"></p>');
var gapDuration = (new Date().getTime()) + (nextStartTime - endTime); let gapDuration = (new Date().getTime()) + (nextStartTime - endTime);
let messageP = $j(".vjsMessage"); let messageP = $j(".vjsMessage");
var x = setInterval(function() { let x = setInterval(function() {
var now = new Date().getTime(); let now = new Date().getTime();
var remainder = new Date(Math.round(gapDuration - now)).toISOString().substr(11,8); let remainder = new Date(Math.round(gapDuration - now)).toISOString().substr(11,8);
messageP.html(remainder + ' to next event.'); messageP.html(remainder + ' to next event.');
if (remainder < 0) { if (remainder < 0) {
clearInterval(x); clearInterval(x);
@ -41,8 +38,6 @@ function vjsReplay() {
streamNext( true ); streamNext( true );
break; break;
} }
});
});
} }
$j.ajaxSetup ({timeout: AJAX_TIMEOUT }); //sets timeout for all getJSON. $j.ajaxSetup ({timeout: AJAX_TIMEOUT }); //sets timeout for all getJSON.