Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug/654 redirect to stats.php on disconnect #672

Merged
merged 3 commits into from
Mar 15, 2024
Merged

Bug/654 redirect to stats.php on disconnect #672

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
232d154
Added 'redirectOnFail' and set stats requests to not do so
JahleelAbraham Mar 8, 2024
b98960b
Update main.js
JahleelAbraham Mar 11, 2024
8e5fcb6
Added values to all call sites of ajaxReq.send()
JahleelAbraham Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions www/template/dist/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ function updateStatData() {
snr.hide();
}
}
});
}, false);
setTimeout("updateStatData();", 2000);
}

Expand Down Expand Up @@ -178,7 +178,7 @@ var ajaxReq = function () {
var class_after_success = null;


var send = function () {
var send = function (redirectOnFail = true) {
if (form !== null) form_data = new FormData(form[0]);

if (alert_bl !== null) {
Expand Down Expand Up @@ -241,9 +241,11 @@ var ajaxReq = function () {
respProc(msg);
})
.fail(function(msg) {
// This is workaround for ublockORIGIN browser plugin which blocks get HTML requests(logs page - issue #474).
console.error('Request failed redirecting to ' + form_act)
location.href = location.origin + form_act
if(redirectOnFail) {
// This is workaround for ublockORIGIN browser plugin which blocks get HTML requests(logs page - issue #474).
console.error('Request failed redirecting to ' + form_act)
location.href = location.origin + form_act
}

if (error_ajax) alert('err ajax');

Expand Down Expand Up @@ -485,7 +487,7 @@ var ajaxReq = function () {
return false;
};

self.manReq = function (data) {
self.manReq = function (data, redirectOnFail = true) {
form_act = data.form_act || null;
type_req = data.type_req || type_req;
type_data = data.type_data || type_data;
Expand All @@ -509,7 +511,7 @@ var ajaxReq = function () {
//if ((data.callback_func !== null) && (typeof(data.callback_func === 'function'))) {
//callback_func = data.callback_func;
//};
send();
send(redirectOnFail);
};

var constructor = function () {
Expand All @@ -519,7 +521,7 @@ var ajaxReq = function () {
function ajaxEvent() {
$('body').on("click", ".send-req-form", function(e){
var ajax_req = new ajaxReq();
return ajax_req.setData($(this));
return ajax_req.setData($(this));
});

$('body').on("change", ".send-req-form-select", function(e){
Expand Down
Loading