Mirror/zapret-openwrt
1
0
Fork 0
mirror of https://github.com/remittor/zapret-openwrt.git synced 2025-12-06 11:36:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

luci: Fix refresh textarea with logs

Browse Source
This commit is contained in:
remittor
2025-02-10 19:50:03 +03:00
parent 2529444929
commit 794f86a34c
1 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
luci-app-zapret/htdocs/luci-static/resources/view/zapret/dmnlog.js
View File

@@ -71,22 +71,35 @@ return view.extend({
}, },
pollLog: async function() { pollLog: async function() {
const elem0 = document.getElementById('dmnlog_0'); let logdate_len = -2;
if (elem0) { let logdata;
const logdata = await this.retrieveLog(); for (let txt_id = 0; txt_id < 10; txt_id++) {
for (let log_num = 0; log_num < logdata.length; log_num++) { let elem = document.getElementById('dmnlog_' + txt_id);
let elem = document.getElementById('dmnlog_' + log_num); if (!elem)
if (elem) { break;
if (logdata[log_num].data) { if (logdate_len == -2) {
elem.value = logdata[log_num].data; logdata = await this.retrieveLog();
elem.rows = logdata[log_num].rows; logdate_len = (logdata) ? logdata.length : -1;
} else { }
elem.value = ''; let elem_name = elem.getAttribute("name");
elem.rows = 0; let founded = false;
if (logdate_len > 0) {
for (let log_num = 0; log_num < logdate_len; log_num++) {
if (logdata[log_num].filename == elem_name) {
if (logdata[log_num].data) {
elem.value = logdata[log_num].data;
elem.rows = logdata[log_num].rows;
founded = true;
//console.log('POLL: updated ' + elem_name);
}
break;
} }
} }
} }
//console.log('POLL: updated ' + logdata.length); if (!founded) {
elem.value = '';
elem.rows = 0;
}
} }
}, },
@@ -137,13 +150,16 @@ return view.extend({
scrollDownButton.focus(); scrollDownButton.focus();
}); });
let log_id = 'dmnlog_' + log_num;
let log_name = logdata[log_num].filename;
let log_text = (logdata[log_num].data) ? logdata[log_num].data : ''; let log_text = (logdata[log_num].data) ? logdata[log_num].data : '';
let tab = E('div', { 'data-tab': tabname, 'data-tab-title': tabNameText }, [ let tab = E('div', { 'data-tab': tabname, 'data-tab-title': tabNameText }, [
E('div', { 'id': 'content_dmnlog_' + log_num }, [ E('div', { 'id': 'content_dmnlog_' + log_num }, [
E('div', {'style': 'padding-bottom: 20px'}, [ scrollDownButton ]), E('div', {'style': 'padding-bottom: 20px'}, [ scrollDownButton ]),
E('textarea', { E('textarea', {
'id': 'dmnlog_' + log_num, 'id': log_id,
'name': log_name,
'style': 'font-size:12px', 'style': 'font-size:12px',
'readonly': 'readonly', 'readonly': 'readonly',
'wrap': 'off', 'wrap': 'off',