mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-15 18:14:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

test for 0 before setting width and height

Browse Source
This commit is contained in:
Isaac Connor
2022-05-26 12:32:26 -04:00
parent 082fff850f
commit 57bd502bb9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/js/MonitorStream.js
View File

@@ -97,7 +97,7 @@ function MonitorStream(monitorData) {
}
stream_frame = $j('#monitor'+this.id);
if (((newscale == '0') || (newscale=='auto')) && (width=='auto')) {
if (((newscale == '0' || newscale == 0) || (newscale=='auto')) && (width=='auto' || !width)) {
if (!this.bottomElement) {
newscale = parseInt(100*monitor_frame.width() / this.width);
// We don't want to change the existing css, cuz it might be 59% or 123px or auto;
@@ -121,9 +121,9 @@ function MonitorStream(monitorData) {
width = Math.round(parseInt(this.width) * newscale / 100)+'px';
height = Math.round(parseInt(this.height) * newscale / 100)+'px';
}
monitor_frame.css('width', width);
//img.style.width = width;
img.style.height = height;
if (width && width != '0px') monitor_frame.css('width', width);
if (height && height != '0px') img.style.height = height;
this.setStreamScale(newscale);
}; // setscale