ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Have to clear src before resetting or some browsers won't load the new image

This commit is contained in:
Isaac Connor 2022-01-08 12:14:28 -05:00
parent 36a493ad5e
commit c8bc0661b1
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
web/js/MonitorStream.js
View File

@ -2,6 +2,8 @@
function MonitorStream(monitorData) { function MonitorStream(monitorData) {
this.id = monitorData.id; this.id = monitorData.id;
this.connKey = monitorData.connKey; this.connKey = monitorData.connKey;
this.auth_relay = auth_relay;
this.auth_hash = auth_hash;
this.url = monitorData.url; this.url = monitorData.url;
this.url_to_zms = monitorData.url_to_zms; this.url_to_zms = monitorData.url_to_zms;
this.width = monitorData.width; this.width = monitorData.width;
@ -206,36 +208,38 @@ function MonitorStream(monitorData) {
var newAlarm = ( isAlarmed && !wasAlarmed ); var newAlarm = ( isAlarmed && !wasAlarmed );
var oldAlarm = ( !isAlarmed && wasAlarmed ); var oldAlarm = ( !isAlarmed && wasAlarmed );
if ( newAlarm ) { if (newAlarm) {
if ( false && SOUND_ON_ALARM ) { if (false && SOUND_ON_ALARM) {
// Enable the alarm sound // Enable the alarm sound
$j('#alarmSound').removeClass('hidden'); $j('#alarmSound').removeClass('hidden');
} }
if ( (typeof POPUP_ON_ALARM !== 'undefined') && POPUP_ON_ALARM ) { if ((typeof POPUP_ON_ALARM !== 'undefined') && POPUP_ON_ALARM) {
windowToFront(); windowToFront();
} }
} }
if ( false && SOUND_ON_ALARM ) { if (false && SOUND_ON_ALARM) {
if ( oldAlarm ) { if ( oldAlarm ) {
// Disable alarm sound // Disable alarm sound
$j('#alarmSound').addClass('hidden'); $j('#alarmSound').addClass('hidden');
} }
} }
if ( this.status.auth ) { if (this.status.auth) {
if ( this.status.auth != auth_hash ) { if (this.status.auth != auth_hash) {
// Try to reload the image stream. // Try to reload the image stream.
if ( stream ) { if (stream) {
stream.src = stream.src.replace(/auth=\w+/i, 'auth='+this.status.auth); const oldsrc = stream.src;
stream.src = '';
stream.src = oldsrc.replace(/auth=\w+/i, 'auth='+this.status.auth);
} }
console.log("Changed auth from " + auth_hash + " to " + this.status.auth); console.log("Changed auth from " + this.auth_hash + " to " + this.status.auth);
auth_hash = this.status.auth; this.auth_hash = this.status.auth;
} }
} // end if have a new auth hash } // end if have a new auth hash
} // end if has state } // end if has state
} else { } else {
console.error(respObj.message); console.error(respObj.message);
// Try to reload the image stream. // Try to reload the image stream.
if ( stream ) { if (stream) {
if ( stream.src ) { if ( stream.src ) {
console.log('Reloading stream: ' + stream.src); console.log('Reloading stream: ' + stream.src);
src = stream.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) )); src = stream.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));