ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle a zero value for scale

This commit is contained in:
Isaac Connor 2020-02-25 11:18:13 -05:00
parent 2f89bd28b7
commit 8a83449fba
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,12 +155,12 @@ function changeScale() {
var eventViewer;
var alarmCue = $j('div.alarmCue');
var bottomEl = streamMode == 'stills' ? $j('#eventImageNav') : $j('#replayStatus');
if (streamMode == 'stills') {
if ( streamMode == 'stills' ) {
eventViewer = $j('#eventThumbs');
} else {
eventViewer = $j(vid ? '#videoobj' : '#evtStream');
}
if ( scale == "auto" ) {
if ( scale == '0' ) {
var newSize = scaleToFit(eventData.Width, eventData.Height, eventViewer, bottomEl);
newWidth = newSize.width;
newHeight = newSize.height;
@ -172,10 +172,10 @@ function changeScale() {
}
if ( !(streamMode == 'stills') ) {
eventViewer.width(newWidth);
} //stills handles its own width
} // stills handles its own width
eventViewer.height(newHeight);
if ( !vid ) { // zms needs extra sizing
streamScale(scale == "auto" ? autoScale : scale);
streamScale(scale == '0' ? autoScale : scale);
drawProgressBar();
}
if ( streamMode == 'stills' ) {
@ -184,7 +184,7 @@ function changeScale() {
} else {
alarmCue.html(renderAlarmCues(eventViewer));//just re-render alarmCues. skip ajax call
}
if ( scale == "auto" ) {
if ( scale == '0' ) {
Cookie.write('zmEventScaleAuto', 'auto', {duration: 10*365});
} else {
Cookie.write('zmEventScale'+eventData.MonitorId, scale, {duration: 10*365});
@ -1091,7 +1091,7 @@ function initPage() {
}
nearEventsQuery(eventData.Id);
initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues
if ( scale == 'auto' ) changeScale();
if ( scale == '0' ) changeScale();
}
// Kick everything off