From 24a9dcbf47db254d868580c1d87fd5dfc5363e84 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 20 Jan 2022 11:50:53 -0500 Subject: [PATCH] If rate > 1600, limit it to 1600 to prevent logged errors --- web/skins/classic/views/js/montage.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js index f6da7fbac..5dfff5afc 100644 --- a/web/skins/classic/views/js/montage.js +++ b/web/skins/classic/views/js/montage.js @@ -117,7 +117,7 @@ function changeSize() { monitor_frame.css('height', ( height ? height+'px' : 'auto')); /*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.nodeName == 'IMG' ) { var src = streamImg.src; @@ -269,7 +269,7 @@ function cancel_layout(button) { $j('#EditLayout').show(); for ( var i = 0, length = monitors.length; i < length; i++ ) { var monitor = monitors[i]; - monitor.setup_onclick(); + monitor.setup_onclick(handleClick); //monitor_feed = $j('#imageFeed'+monitor.id); //monitor_feed.click(monitor.onclick); @@ -312,7 +312,7 @@ function initPage() { if ( monitors[i].type == 'WebSite' && interval > 0 ) { setInterval(reloadWebSite, interval*1000, i); } - monitors[i].setup_onclick(); + monitors[i].setup_onclick(handleClick); } selectLayout('#zmMontageLayout'); } @@ -322,5 +322,15 @@ function watchFullscreen() { 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 $j(document).ready(initPage);