ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix eslint

pull/4202/head
Isaac Connor 2022-04-28 09:17:11 -04:00
parent 8bdaaf097c
commit cd457ae03f
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/skins/classic/views/js/cycle.js
View File

@ -67,7 +67,7 @@ function changeSize() {
monitor_frame.css('height', height);
if (scale > 100) scale = 100;
if (scale <= 0) scale = 100;
$j('#scale').val('0');
setCookie('zmCycleScale', '0', 3600);
setCookie('zmCycleWidth', width, 3600);
@ -116,7 +116,7 @@ function applyScale() {
}
monitor_frame.width(newWidth);
monitor_frame.height(newHeight);
let monitor_image = $j('#imageFeed'+monitor.id + ' img');
const monitor_image = $j('#imageFeed'+monitor.id + ' img');
monitor_image.width('100%');
monitor_image.height('auto');

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

@ -144,10 +144,8 @@ function changeScale() {
setCookie('zmMontageHeight', '', 3600);
$j('#zmMontageLayout').val(freeform_layout_id);
selectLayout('#zmMontageLayout');
for ( var i = 0, length = monitors.length; i < length; i++ ) {
var monitor = monitors[i];
var newWidth = ( monitorData[i].width * scale ) / SCALE_BASE;
var newHeight = ( monitorData[i].height * scale ) / SCALE_BASE;
for ( let i = 0, length = monitors.length; i < length; i++ ) {
const monitor = monitors[i];
// Scale the frame
monitor_frame = $j('#monitorFrame'+monitor.id);
@ -156,15 +154,15 @@ function changeScale() {
continue;
}
if ( scale != '0' ) {
const newWidth = ( monitorData[i].width * scale ) / SCALE_BASE;
if ( newWidth ) {
console.log("Setting to " + newWidth);
monitor_frame.css('width', newWidth);
}
}
//monitor_frame.css('width', '100%');
monitor_img = $j('#liveStream'+monitor.id);
monitor_img.css('width', '100%');
monitor_img.css('height', 'auto');
monitor_img = $j('#liveStream'+monitor.id);
monitor_img.css('width', '100%');
monitor_img.css('height', 'auto');
monitor.setStreamScale(scale);
} // end foreach Monitor
}