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

fix case of vidWidth. Fixes #3162

pull/3164/head
Isaac Connor 2021-02-14 16:28:08 -05:00
parent 9c3bf0af1d
commit 71183a6002
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -613,7 +613,7 @@ function getEventResponse(respObj, respText) {
} else { } else {
drawProgressBar(); drawProgressBar();
} }
nearEventsQuery( eventData.Id ); nearEventsQuery(eventData.Id);
} // end function getEventResponse } // end function getEventResponse
function eventQuery(eventId) { function eventQuery(eventId) {
@ -626,10 +626,11 @@ function eventQuery(eventId) {
.fail(logAjaxFail); .fail(logAjaxFail);
} }
function getNearEventsResponse( respObj, respText ) { function getNearEventsResponse(respObj, respText) {
if ( checkStreamForErrors('getNearEventsResponse', respObj) ) { if ( checkStreamForErrors('getNearEventsResponse', respObj) ) {
return; return;
} }
console.log(respObj);
prevEventId = respObj.nearevents.PrevEventId; prevEventId = respObj.nearevents.PrevEventId;
nextEventId = respObj.nearevents.NextEventId; nextEventId = respObj.nearevents.NextEventId;
prevEventStartTime = Date.parse(respObj.nearevents.PrevEventStartTime); prevEventStartTime = Date.parse(respObj.nearevents.PrevEventStartTime);
@ -641,7 +642,7 @@ function getNearEventsResponse( respObj, respText ) {
$j('#nextBtn').prop('disabled', nextEventId == 0 ? true : false).attr('class', nextEventId == 0 ? 'unavail' : 'inactive'); $j('#nextBtn').prop('disabled', nextEventId == 0 ? true : false).attr('class', nextEventId == 0 ? 'unavail' : 'inactive');
} }
function nearEventsQuery( eventId ) { function nearEventsQuery(eventId) {
$j.getJSON(thisUrl + '?view=request&request=status&entity=nearevents&id='+eventId+filterQuery+sortQuery) $j.getJSON(thisUrl + '?view=request&request=status&entity=nearevents&id='+eventId+filterQuery+sortQuery)
.done(getNearEventsResponse) .done(getNearEventsResponse)
.fail(logAjaxFail); .fail(logAjaxFail);
@ -839,7 +840,7 @@ function getStat() {
}); });
} }
function onStatsResize(vidwidth) { function onStatsResize(vidWidth) {
if (!vidWidth) return; if (!vidWidth) return;
var minWidth = 300; // An arbitrary value in pixels used to hide the stats table var minWidth = 300; // An arbitrary value in pixels used to hide the stats table
var scale = $j('#scale').val(); var scale = $j('#scale').val();
@ -848,8 +849,8 @@ function onStatsResize(vidwidth) {
vidWidth = vidWidth * (scale/100); vidWidth = vidWidth * (scale/100);
} }
var width = $j(window).width() - vidwidth; var width = $j(window).width() - vidWidth;
//console.log("Width: " + width + " = window.width " + $j(window).width() + "- vidWidth" + vidwidth); //console.log("Width: " + width + " = window.width " + $j(window).width() + "- vidWidth" + vidWidth);
// Hide the stats table if we have run out of room to show it properly // Hide the stats table if we have run out of room to show it properly
if ( width < minWidth ) { if ( width < minWidth ) {