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

Move changeScale down as the video area has to have height before we can call scaleToFit

pull/4131/merge
Isaac Connor 2024-12-16 10:56:43 -05:00
parent 7b6d4952bd
commit 3aaba3154b
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web/skins/classic/views/js/event.js
View File

@ -42,7 +42,7 @@ var coordinateMouse = {
}; };
var leftBtnStatus = {Down: false, UpAfterDown: false}; var leftBtnStatus = {Down: false, UpAfterDown: false};
var updateScale = false; //Scale needs to be updated var updateScale = false; //Scale needs to be updated
var currentScale = 0; // Temporarily, because need to put things in order with the "scale" variable = "select" block var currentScale = 100; // Temporarily, because need to put things in order with the "scale" variable = "select" block
$j(document).on("keydown", "", function(e) { $j(document).on("keydown", "", function(e) {
e = e || window.event; e = e || window.event;
@ -309,13 +309,13 @@ function changeScale() {
newSize = scaleToFit(eventData.Width, eventData.Height, eventViewer, bottomEl, $j('#wrapperEventVideo')); newSize = scaleToFit(eventData.Width, eventData.Height, eventViewer, bottomEl, $j('#wrapperEventVideo'));
newWidth = newSize.width; newWidth = newSize.width;
newHeight = newSize.height; newHeight = newSize.height;
currentScale = newSize.autoScale; currentScale = newSize.autoScale ? newSize.autoScale : 100;
} else if (scaleSel == 'fit_to_width') { } else if (scaleSel == 'fit_to_width') {
//Fit to screen width //Fit to screen width
newSize = scaleToFit(eventData.Width, eventData.Height, eventViewer, false, $j('#wrapperEventVideo')); newSize = scaleToFit(eventData.Width, eventData.Height, eventViewer, false, $j('#wrapperEventVideo'));
newWidth = newSize.width; newWidth = newSize.width;
newHeight = newSize.height; newHeight = newSize.height;
currentScale = newSize.autoScale; currentScale = newSize.autoScale ? newSize.autoScale : 100;
} else if (scaleSel.indexOf("px") > -1) { } else if (scaleSel.indexOf("px") > -1) {
newSize = scaleToFit(eventData.Width, eventData.Height, eventViewer, false, $j('#wrapperEventVideo')); // Only for calculating the maximum width! newSize = scaleToFit(eventData.Width, eventData.Height, eventViewer, false, $j('#wrapperEventVideo')); // Only for calculating the maximum width!
let w = 0; let w = 0;
@ -1347,7 +1347,6 @@ function initPage() {
// Load the event stats // Load the event stats
getStat(); getStat();
zmPanZoom.init(); zmPanZoom.init();
changeStreamQuality();
if (getEvtStatsCookie() != 'on') { if (getEvtStatsCookie() != 'on') {
eventStats.toggle(false); eventStats.toggle(false);
@ -1411,15 +1410,17 @@ function initPage() {
} }
} }
} // end if videojs or mjpeg stream } // end if videojs or mjpeg stream
progressBarNav();
//if (scale == '0') changeScale();
changeScale();
nearEventsQuery(eventData.Id); nearEventsQuery(eventData.Id);
initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues
document.querySelectorAll('select[name="rate"]').forEach(function(el) { document.querySelectorAll('select[name="rate"]').forEach(function(el) {
el.onchange = window['changeRate']; el.onchange = window['changeRate'];
}); });
console.log('progress');
progressBarNav();
console.log('changescale');
changeScale();
console.log('changeStreamQality');
changeStreamQuality();
// enable or disable buttons based on current selection and user rights // enable or disable buttons based on current selection and user rights
renameBtn.prop('disabled', !canEdit.Events); renameBtn.prop('disabled', !canEdit.Events);