Mirror/zapret-openwrt
1
0
Fork 0
mirror of https://github.com/remittor/zapret-openwrt.git synced 2026-01-27 04:40:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

luci: Fix show NFQWS2_OPT

Browse Source
This commit is contained in:
remittor
2026-01-13 21:36:30 +03:00
parent ee8089e1bb
commit a84174e51d
3 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/settings.js
View File

@@ -7,6 +7,11 @@
'require view'; 'require view';
'require view.zapret2.tools as tools'; 'require view.zapret2.tools as tools';
document.head.appendChild(E('link', {
rel: 'stylesheet',
href: L.resource('view/zapret2/styles.css')
}));
return view.extend({ return view.extend({
parsers: { }, parsers: { },
@@ -128,8 +133,10 @@ return view.extend({
let btn = sec.taboption(tabname, form.Button, '_' + param + '_btn', locname); let btn = sec.taboption(tabname, form.Button, '_' + param + '_btn', locname);
btn.inputtitle = _('Edit'); btn.inputtitle = _('Edit');
btn.inputstyle = 'edit btn'; btn.inputstyle = 'edit btn';
let val = sec.taboption(tabname, form.DummyValue, '_' + param); let val = sec.taboption(tabname, form.TextValue, '_' + param);
val.rawhtml = multiline ? true : false; val.readonly = true;
val.rows = rows + 5;
val.wrap = false;
val.cfgvalue = function(section_id) { val.cfgvalue = function(section_id) {
let value = uci.get(tools.appName, section_id, param); let value = uci.get(tools.appName, section_id, param);
if (value == null) { if (value == null) {
@@ -141,15 +148,10 @@ return view.extend({
value = value.replace(/\n --/g, "\n--"); value = value.replace(/\n --/g, "\n--");
value = value.replace(/ --/g, "\n--"); value = value.replace(/ --/g, "\n--");
} }
if (val.rawhtml) {
value = value.replace(/</g, '˂');
value = value.replace(/>/g, '˃');
value = value.replace(/\n/g, '<br/>');
}
return value; return value;
}; };
val.validate = function(section_id, value) { val.validate = function(section_id, value) {
return (value) ? value.trim() : ""; return true;
}; };
let desc = locname; let desc = locname;
if (multiline == 2) { if (multiline == 2) {

6
luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/styles.css Normal file
View File

@@ -0,0 +1,6 @@
textarea, .cbi-value textarea
{
white-space: pre;
overflow-x: auto;
font-family: monospace;
}

18
luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/tools.js
View File

@@ -506,24 +506,10 @@ return baseclass.extend({
value = value.replace(/˂/g, '<'); value = value.replace(/˂/g, '<');
value = value.replace(/˃/g, '>'); value = value.replace(/˃/g, '>');
try { try {
let elem = document.getElementById("cbi-" + this.appName + "-" + this.cfgsec + "-_" + this.cfgparam); let elem = document.getElementById("widget.cbid." + this.appName + ".config._" + this.cfgparam);
if (elem) {
if (elem.querySelector('div')) {
elem = elem.querySelector('div');
} else {
elem = elem.querySelector('output');
}
}
if (elem) { if (elem) {
let val = value.trim(); let val = value.trim();
if (this.multiline) { elem.textContent = val;
val = val.replace(/</g, '˂');
val = val.replace(/>/g, '˃');
val = val.replace(/\n/g, '<br/>');
elem.innerHTML = val;
} else {
elem.textContent = val;
}
} }
} catch(e) { } catch(e) {
console.error('ERROR: cannot found elem for ' + this.cfgsec + '.' + this.cfgparam); console.error('ERROR: cannot found elem for ' + this.cfgsec + '.' + this.cfgparam);