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

Revert "Don't allow a scale of 0. Default to 100. Call changeStreamQuality after changeScale so that we always pass the right value. Prevents Errors in logs about bogus scale value" 

This reverts commit 223dc4b70f.
pull/4131/merge
Isaac Connor 2024-12-16 10:45:30 -05:00
parent b71d6e4569
commit 7b6d4952bd
1 changed files with 8 additions and 9 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 updateScale = false; //Scale needs to be updated
var currentScale = 100; // Temporarily, because need to put things in order with the "scale" variable = "select" block
var currentScale = 0; // Temporarily, because need to put things in order with the "scale" variable = "select" block
$j(document).on("keydown", "", function(e) {
e = e || window.event;
@ -309,13 +309,13 @@ function changeScale() {
newSize = scaleToFit(eventData.Width, eventData.Height, eventViewer, bottomEl, $j('#wrapperEventVideo'));
newWidth = newSize.width;
newHeight = newSize.height;
currentScale = newSize.autoScale ? newSize.autoScale : 100;
currentScale = newSize.autoScale;
} else if (scaleSel == 'fit_to_width') {
//Fit to screen width
newSize = scaleToFit(eventData.Width, eventData.Height, eventViewer, false, $j('#wrapperEventVideo'));
newWidth = newSize.width;
newHeight = newSize.height;
currentScale = newSize.autoScale ? newSize.autoScale : 100;
currentScale = newSize.autoScale;
} else if (scaleSel.indexOf("px") > -1) {
newSize = scaleToFit(eventData.Width, eventData.Height, eventViewer, false, $j('#wrapperEventVideo')); // Only for calculating the maximum width!
let w = 0;
@ -1347,6 +1347,7 @@ function initPage() {
// Load the event stats
getStat();
zmPanZoom.init();
changeStreamQuality();
if (getEvtStatsCookie() != 'on') {
eventStats.toggle(false);
@ -1355,12 +1356,6 @@ function initPage() {
onStatsResize(eventData.Width);
wrapperEventVideo.removeClass('col-sm-12').addClass('col-sm-8');
}
console.log('progress');
progressBarNav();
console.log('changescale');
changeScale();
console.log('changeStreamQality');
changeStreamQuality();
//FIXME prevent blocking...not sure what is happening or best way to unblock
if (document.getElementById('videoobj')) {
@ -1416,12 +1411,16 @@ function initPage() {
}
}
} // end if videojs or mjpeg stream
progressBarNav();
//if (scale == '0') changeScale();
changeScale();
nearEventsQuery(eventData.Id);
initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues
document.querySelectorAll('select[name="rate"]').forEach(function(el) {
el.onchange = window['changeRate'];
});
// enable or disable buttons based on current selection and user rights
renameBtn.prop('disabled', !canEdit.Events);
archiveBtn.prop('disabled', !(!eventData.Archived && canEdit.Events));