profxadke/captive.whump.shanti-portal
1
0
Fork 0
mirror of https://codeberg.org/prof_x_pvt_ltd/captive.whump.shanti-portal synced 2024-08-14 22:46:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

vsc formatting and testing a lower timeout for apple devices

Browse source
This commit is contained in:
Stefan Midjich 2017-09-29 16:04:56 +02:00
parent 37028c98d2
commit fd8e97c673
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
static/js/captiveportal.js
View file

@ -30,9 +30,9 @@ function do_success() {
// If url does not start with http the window.location redirect // If url does not start with http the window.location redirect
// won't work. So prefix http to url. // won't work. So prefix http to url.
if (!url.startsWith('http')) { if (!url.startsWith('http')) {
url = 'http://'+url; url = 'http://' + url;
} }
console.log('success: '+url); console.log('success: ' + url);
$('#error-box').html('<p>If you\'re not automatically redirected open your browser and try any website manually.</p>'); $('#error-box').html('<p>If you\'re not automatically redirected open your browser and try any website manually.</p>');
$('#error-box').show(); $('#error-box').show();
$('#statusDiv').html(''); $('#statusDiv').html('');
@ -51,8 +51,8 @@ function do_error(message) {
$('#error-box').show(); $('#error-box').show();
$('#error-box').html('<p>Failed. Reload page and try again or contact support.</p> '); $('#error-box').html('<p>Failed. Reload page and try again or contact support.</p> ');
if (message) { if (message) {
console.log('server: '+message); console.log('server: ' + message);
$('#error-box').append('<p>System response: '+message+'</p>'); $('#error-box').append('<p>System response: ' + message + '</p>');
} }
} }
@ -61,21 +61,21 @@ function do_error(message) {
function poll_jobs(data) { function poll_jobs(data) {
var promises = []; var promises = [];
if(debug) { if (debug) {
console.log('Jobs data: ', data); console.log('Jobs data: ', data);
} }
// Push promises into array // Push promises into array
for(var job in data) { for (var job in data) {
var job_id = data[job].id; var job_id = data[job].id;
var api_url = '/job/'+job_id; var api_url = '/job/' + job_id;
if (debug) { if (debug) {
console.log('Processing job: ', data[job]); console.log('Processing job: ', data[job]);
} }
promises.push(new Promise(function(resolve, reject) { promises.push(new Promise(function(resolve, reject) {
var maxRun = plugin_timeout/2; var maxRun = plugin_timeout / 2;
var timesRun = 0; var timesRun = 0;
// Timer function that polls the API for job results // Timer function that polls the API for job results
@ -90,23 +90,23 @@ function poll_jobs(data) {
} }
console.log(job_result); console.log(job_result);
if(job_result.is_finished) { if (job_result.is_finished) {
console.log('Resolving job: ', job_result); console.log('Resolving job: ', job_result);
resolve(job_result); resolve(job_result);
clearTimeout(timer); clearTimeout(timer);
return(true); return (true);
} }
if(job_result.is_failed) { if (job_result.is_failed) {
console.log('Job failed: ', job_result); console.log('Job failed: ', job_result);
reject(job_result); reject(job_result);
clearTimeout(timer); clearTimeout(timer);
return(false); return (false);
} }
}); });
ajaxReq.fail(function(XMLHttpRequest, textStatus, errorThrown) { ajaxReq.fail(function(XMLHttpRequest, textStatus, errorThrown) {
console.log('Request Error: '+ XMLHttpRequest.responseText + ', status:' + XMLHttpRequest.status + ', status text: ' + XMLHttpRequest.statusText); console.log('Request Error: ' + XMLHttpRequest.responseText + ', status:' + XMLHttpRequest.status + ', status text: ' + XMLHttpRequest.statusText);
reject(XMLHttpRequest.responseText); reject(XMLHttpRequest.responseText);
}); });
@ -129,7 +129,7 @@ function poll_jobs(data) {
Promise.all(promises).then(function(result) { Promise.all(promises).then(function(result) {
var success = true; var success = true;
for(var i=0;i<result.length;i++) { for (var i = 0; i < result.length; i++) {
var r = result[i].result; var r = result[i].result;
var meta = result[i].meta; var meta = result[i].meta;
if (meta.mandatory) { if (meta.mandatory) {
@ -146,10 +146,10 @@ function poll_jobs(data) {
// Apple devices don't poll their captiveportal URL, // Apple devices don't poll their captiveportal URL,
// so this is for them. Android devices will do their // so this is for them. Android devices will do their
// own polling and close the wifi-portal before this. // own polling and close the wifi-portal before this.
setTimeout(do_success, 30000); setTimeout(do_success, 10000);
} }
// This is reject() above. // This is reject() above.
}, function(reason) { }, function(reason) {
do_error(reason); do_error(reason);
}); });
@ -157,7 +157,7 @@ function poll_jobs(data) {
// Submit the form // Submit the form
$('#approveForm').submit(function (event) { $('#approveForm').submit(function(event) {
var api_url = '/approve'; var api_url = '/approve';
event.preventDefault(); event.preventDefault();
$('#error-box').hide(); $('#error-box').hide();
@ -170,9 +170,9 @@ $('#approveForm').submit(function (event) {
ajaxReq.done(poll_jobs); ajaxReq.done(poll_jobs);
ajaxReq.fail(function(XMLHttpRequest, textStatus, errorThrown) { ajaxReq.fail(function(XMLHttpRequest, textStatus, errorThrown) {
console.log('Request Error: '+ XMLHttpRequest.responseText + ', status:' + XMLHttpRequest.status + ', status text: ' + XMLHttpRequest.statusText); console.log('Request Error: ' + XMLHttpRequest.responseText + ', status:' + XMLHttpRequest.status + ', status text: ' + XMLHttpRequest.statusText);
do_error(XMLHttpRequest.responseText); do_error(XMLHttpRequest.responseText);
}); });
} }
}); });