mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-13 11:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

split setScale into setStreamScale so we can set the img.src without altering the frame

Browse Source
This commit is contained in:
Isaac Connor
2022-04-22 15:50:55 -04:00
parent 07e6ae931f
commit 2fb44769b6
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
web/js/MonitorStream.js
View File

@@ -88,7 +88,7 @@ function MonitorStream(monitorData) {
}
stream_frame = $j('#monitor'+this.id);
if ((newscale == '0') || (width=='auto' && height=='auto' && newscale=='')) {
if ((newscale == '0') || (newscale=='auto') || (width=='auto' && height=='auto' && newscale=='')) {
if (!this.bottomElement) {
console.log("No bottom element set. Setting to monitorStatus");
this.bottomElement = document.getElementById('monitorStatus'+this.id);
@@ -116,7 +116,21 @@ function MonitorStream(monitorData) {
height = Math.round(parseInt(this.height) * newscale / 100);
console.log("Setting to " + width + "x" + height + " from " + newscale);
}
monitor_frame.css('width', parseInt(width) ? parseInt(width)+'px' : 'auto');
this.setStreamScale(newscale);
}; // setscale
this.setStreamScale = function(newscale) {
const img = this.getElement();
if (!img) {
console.log("No img in setScale");
return;
}
const stream_frame = $j('#monitor'+this.id);
if (!newscale) {
newscale = parseInt(100*parseInt(stream_frame.width())/this.width);
console.log(newscale + " = " + this.width + " / " + stream_frame.width());
}
if (img.nodeName == 'IMG') {
if (newscale > 100) newscale = 100; // we never request a larger image, as it just wastes bandwidth
if (newscale < 0) newscale = 100;
@@ -138,11 +152,6 @@ function MonitorStream(monitorData) {
img.src = newSrc;
}
}
monitor_frame.css('width', parseInt(width) ? parseInt(width)+'px' : 'auto');
// monitor_frame never has fixed height
//stream_frame.css('width', parseInt(width) ? width : 'auto');
//stream_frame.css('height', parseInt(height) ? height : 'auto');
}; // setscale
this.start = function(delay) {