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

Add aborting in transit events loading before sending another.

pull/3779/head
Isaac Connor 2023-10-16 12:15:55 -04:00
parent 1658943097
commit c6d9c7731d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/skins/classic/views/js/events.js
View File

@ -7,6 +7,7 @@ var exportBtn = $j('#exportBtn');
var downloadBtn = $j('#downloadBtn'); var downloadBtn = $j('#downloadBtn');
var deleteBtn = $j('#deleteBtn'); var deleteBtn = $j('#deleteBtn');
var table = $j('#eventTable'); var table = $j('#eventTable');
var ajax = null;
/* /*
This is the format of the json object sent by bootstrap-table This is the format of the json object sent by bootstrap-table
@ -43,7 +44,8 @@ function ajaxRequest(params) {
const el = $j(this); const el = $j(this);
params.data[el.attr('name')] = el.val(); params.data[el.attr('name')] = el.val();
}); });
$j.ajax({ if (ajax) ajax.abort();
ajax = $j.ajax({
url: thisUrl + '?view=request&request=events&task=query'+filterQuery, url: thisUrl + '?view=request&request=events&task=query'+filterQuery,
data: params.data, data: params.data,
timeout: 0, timeout: 0,
@ -245,7 +247,6 @@ function initPage() {
// Remove the thumbnail column from the DOM if thumbnails are off globally // Remove the thumbnail column from the DOM if thumbnails are off globally
if (!WEB_LIST_THUMBS) $j('th[data-field="Thumbnail"]').remove(); if (!WEB_LIST_THUMBS) $j('th[data-field="Thumbnail"]').remove();
// Init the bootstrap-table // Init the bootstrap-table
table.bootstrapTable({icons: icons}); table.bootstrapTable({icons: icons});
@ -413,8 +414,7 @@ function initPage() {
}); });
$j('#fieldsTable input, #fieldsTable select').each(function(index) { $j('#fieldsTable input, #fieldsTable select').each(function(index) {
el = $j(this); const el = $j(this);
el.on('change', filterEvents);
if (el.hasClass('datetimepicker')) { if (el.hasClass('datetimepicker')) {
el.datetimepicker({timeFormat: "HH:mm:ss", dateFormat: "yy-mm-dd", maxDate: 0, constrainInput: false}); el.datetimepicker({timeFormat: "HH:mm:ss", dateFormat: "yy-mm-dd", maxDate: 0, constrainInput: false});
} }