openwrt
/
luci-app-xray
mirror of https://github.com/yichya/luci-app-xray.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

chore: minor code and style fixes

master
yichya QC 3 months ago
parent
ff491ceb4e
commit
fd3e3ac4a0
1 changed files with 12 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      status/root/www/luci-static/resources/view/xray/status.js

19
status/root/www/luci-static/resources/view/xray/status.js
View File

@ -69,7 +69,7 @@ function get_inbound_uci_description(config, key) {
} }
const uci_key = key.slice(-9); const uci_key = key.slice(-9);
const uci_item = uci.get(config, uci_key); const uci_item = uci.get(config, uci_key);
if (uci_item == null) { if (uci_item === null) {
return key; return key;
} }
switch (uci_item[".type"]) { switch (uci_item[".type"]) {
@ -96,7 +96,7 @@ function get_outbound_uci_description(config, key) {
} }
const uci_key = key.slice(-9); const uci_key = key.slice(-9);
const uci_item = uci.get(config, uci_key); const uci_item = uci.get(config, uci_key);
if (uci_item == null) { if (uci_item === null) {
return "direct"; return "direct";
} }
switch (uci_item[".type"]) { switch (uci_item[".type"]) {
@ -120,7 +120,7 @@ function outbound_first_tag_format(tag_split, first_uci_description) {
let result = [tag_split[0]]; let result = [tag_split[0]];
const first_tag = tag_split[0].split(":"); const first_tag = tag_split[0].split(":");
if (first_tag.length == 1) { if (first_tag.length === 1) {
return result; return result;
} }
@ -200,9 +200,9 @@ function outbound_middle_tag_format(tag_split, first_uci_description, current_ta
} }
function outbound_last_tag_format(first_uci_description, last_tag, last_uci_description) { function outbound_last_tag_format(first_uci_description, last_tag, last_uci_description) {
if (last_tag[0] == "tcp_outbound") { if (last_tag[0] === "tcp_outbound") {
return shared.badge(`{ tcp: <strong>${first_uci_description}</strong> }`); return shared.badge(`{ tcp: <strong>${first_uci_description}</strong> }`);
} else if (last_tag[0] == "udp_outbound") { } else if (last_tag[0] === "udp_outbound") {
return shared.badge(`{ udp: <strong>${first_uci_description}</strong> }`); return shared.badge(`{ udp: <strong>${first_uci_description}</strong> }`);
} }
return shared.badge(`{ ${last_tag[0]}: <strong>${last_uci_description}</strong> }`, last_tag[1]); return shared.badge(`{ ${last_tag[0]}: <strong>${last_uci_description}</strong> }`, last_tag[1]);
@ -216,7 +216,7 @@ function get_outbound_description(config, tag) {
for (let i = 1; i < tag_split.length; i++) { for (let i = 1; i < tag_split.length; i++) {
const current_tag = tag_split[i].split(":"); const current_tag = tag_split[i].split(":");
const current_uci_description = get_outbound_uci_description(config, current_tag[1]); const current_uci_description = get_outbound_uci_description(config, current_tag[1]);
if (i == tag_split.length - 1) { if (i === tag_split.length - 1) {
result.push(" ", outbound_last_tag_format(first_uci_description, current_tag, current_uci_description)); result.push(" ", outbound_last_tag_format(first_uci_description, current_tag, current_uci_description));
} else { } else {
result.push(" ", outbound_middle_tag_format(tag_split, first_uci_description, current_tag, current_uci_description)); result.push(" ", outbound_middle_tag_format(tag_split, first_uci_description, current_tag, current_uci_description));
@ -247,7 +247,12 @@ function observatory(vars, config) {
} }
return _("<i>unreachable</i>"); return _("<i>unreachable</i>");
}(v)), }(v)),
E('td', { 'class': 'td' }, '%d'.format(greater_than_zero(now_timestamp - v[1]["last_seen_time"])) + _('s ago')), E('td', { 'class': 'td' }, function (c) {
if (c[1]["last_seen_time"] === undefined) {
return _("<i>never</i>");
}
return '%d'.format(greater_than_zero(now_timestamp - c[1]["last_seen_time"])) + _('s ago');
}(v)),
E('td', { 'class': 'td' }, '%d'.format(greater_than_zero(now_timestamp - v[1]["last_try_time"])) + _('s ago')), E('td', { 'class': 'td' }, '%d'.format(greater_than_zero(now_timestamp - v[1]["last_try_time"])) + _('s ago')),
])) ]))
]) ])

Write Preview
Loading…
Cancel
Save