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

fix button assignments. Don't abort ajax, as it might be important

pull/3441/head
Isaac Connor 2022-02-18 17:08:40 -05:00
parent 28f3cb18e4
commit 002b2c39aa
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/js/MonitorStream.js
View File

@ -26,7 +26,7 @@ function MonitorStream(monitorData) {
this.buttons = {}; // index by name
this.setButton = function(name, element) {
this.buttons.name = element;
this.buttons[name] = element;
};
this.element = null;
@ -380,6 +380,8 @@ function MonitorStream(monitorData) {
if ('enableAlarmButton' in this.buttons) {
this.buttons.enableAlarmButton.addClass('disabled');
this.buttons.enableAlarmButton.prop('title', disableAlarmsStr);
} else {
console.log('enableAlarmButton not found in buttons');
}
if ('forceAlarmButton' in this.buttons) {
if (streamStatus.forced) {
@ -390,8 +392,11 @@ function MonitorStream(monitorData) {
this.buttons.forceAlarmButton.prop('title', forceAlarmStr);
}
this.buttons.forceAlarmButton.prop('disabled', false);
} else {
console.log('forceAlarmButton not found in buttons');
}
} else {
console.log("streamStatus not enabled");
if ('enableAlarmButton' in this.buttons) {
this.buttons.enableAlarmButton.removeClass('disabled');
this.buttons.enableAlarmButton.prop('title', enableAlarmsStr);
@ -462,6 +467,8 @@ function MonitorStream(monitorData) {
this.alarmCommand = function(command) {
if (this.ajaxQueue) {
console.log("Aborting in progress ajax for alarm");
// Doing this for responsiveness, but we could be aborting something important. Need smarter logic
this.ajaxQueue.abort();
}
const alarmCmdParms = Object.assign({}, this.streamCmdParms);
@ -485,9 +492,6 @@ function MonitorStream(monitorData) {
}
this.streamCmdReq = function(streamCmdParms) {
if (this.ajaxQueue) {
this.ajaxQueue.abort();
}
this.ajaxQueue = jQuery.ajaxQueue({url: this.url, data: streamCmdParms, dataType: "json"})
.done(this.getStreamCmdResponse.bind(this))
.fail(this.onFailure.bind(this));