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

If rate > 1600, limit it to 1600 to prevent logged errors

This commit is contained in:
Isaac Connor 2022-01-20 11:50:53 -05:00
parent 97f2c0a02b
commit 24a9dcbf47
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/skins/classic/views/js/montage.js
View File

@ -117,7 +117,7 @@ function changeSize() {
monitor_frame.css('height', ( height ? height+'px' : 'auto')); monitor_frame.css('height', ( height ? height+'px' : 'auto'));
/*Stream could be an applet so can't use moo tools*/ /*Stream could be an applet so can't use moo tools*/
var streamImg = document.getElementById('liveStream'+monitor.id); var streamImg = monitor.getElement();
if ( streamImg ) { if ( streamImg ) {
if ( streamImg.nodeName == 'IMG' ) { if ( streamImg.nodeName == 'IMG' ) {
var src = streamImg.src; var src = streamImg.src;
@ -269,7 +269,7 @@ function cancel_layout(button) {
$j('#EditLayout').show(); $j('#EditLayout').show();
for ( var i = 0, length = monitors.length; i < length; i++ ) { for ( var i = 0, length = monitors.length; i < length; i++ ) {
var monitor = monitors[i]; var monitor = monitors[i];
monitor.setup_onclick(); monitor.setup_onclick(handleClick);
//monitor_feed = $j('#imageFeed'+monitor.id); //monitor_feed = $j('#imageFeed'+monitor.id);
//monitor_feed.click(monitor.onclick); //monitor_feed.click(monitor.onclick);
@ -312,7 +312,7 @@ function initPage() {
if ( monitors[i].type == 'WebSite' && interval > 0 ) { if ( monitors[i].type == 'WebSite' && interval > 0 ) {
setInterval(reloadWebSite, interval*1000, i); setInterval(reloadWebSite, interval*1000, i);
} }
monitors[i].setup_onclick(); monitors[i].setup_onclick(handleClick);
} }
selectLayout('#zmMontageLayout'); selectLayout('#zmMontageLayout');
} }
@ -322,5 +322,15 @@ function watchFullscreen() {
openFullscreen(content); openFullscreen(content);
} }
function handleClick(evt) {
console.log("handleClick");
var el = evt.currentTarget;
console.log(el);
var id = el.getAttribute("data-monitor-id");
var url = '?view=watch&mid='+id;
evt.preventDefault();
window.location.assign(url);
}
// Kick everything off // Kick everything off
$j(document).ready(initPage); $j(document).ready(initPage);