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

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

This commit is contained in:
Isaac Connor 2022-01-28 15:38:32 -05:00
parent e5792c21c9 a91e7d96f8
commit 51f6a53b6c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dep/RtspServer

@ -1 +1 @@
Subproject commit 1b40f1661f93f50fd5805f239d1e466a3bcf888f
Subproject commit eab32851421ffe54fec0229c3efc44c642bc8d46

10
web/js/MonitorStream.js
View File

@ -38,6 +38,14 @@ function MonitorStream(monitorData) {
}
return this.element;
};
this.getFrame = function() {
if (this.frame) return this.frame;
this.frame = document.getElementById('imageFeed'+this.id);
if (!this.frame) {
console.error("No frame div for #imageFeed"+this.id);
}
return this.frame;
};
/* if the img element didn't have a src, this would fill it in, causing it to show. */
this.show = function() {
@ -161,7 +169,7 @@ function MonitorStream(monitorData) {
this.setup_onclick = function(func) {
this.onclick = func;
const el = this.getElement();
const el = this.getFrame();
if (!el) return;
el.addEventListener('click', this.onclick, false);
};