Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2125 from dibdot/adblock

Browse source 
luci-app-adblock: sync with adblock 3.5.5
This commit is contained in:
Dirk Brenken 2018-09-01 17:10:37 +02:00 committed by GitHub
commit e3b060b3a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 65 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
View file

@ -18,14 +18,13 @@ This is free software, licensed under the Apache License, Version 2.0
//<![CDATA[ //<![CDATA[
function status_update(json) function status_update(json)
{ {
var view = document.getElementById("value_1");
var btn1 = document.getElementById("btn1"); var btn1 = document.getElementById("btn1");
var btn1_running = document.getElementById("btn1_running"); var btn1_running = document.getElementById("btn1_running");
var btn2 = document.getElementById("btn2"); var btn2 = document.getElementById("btn2");
var btn2_running = document.getElementById("btn2_running"); var btn2_running = document.getElementById("btn2_running");
var input = json.data.adblock_status; var input = json.data.adblock_status || "-";
view.innerHTML = input || "-"; document.getElementById("value_1").innerHTML = input;
if (input === "enabled") if (input === "enabled")
{ {
btn1.value = "<%:Suspend%>"; btn1.value = "<%:Suspend%>";
@ -57,21 +56,12 @@ This is free software, licensed under the Apache License, Version 2.0
btn1.disabled = true; btn1.disabled = true;
btn2.disabled = true; btn2.disabled = true;
} }
view = document.getElementById("value_2");
input = json.data.adblock_version; document.getElementById("value_2").innerHTML = json.data.adblock_version || "-";
view.innerHTML = input || "-"; document.getElementById("value_3").innerHTML = json.data.fetch_utility || "-";
view = document.getElementById("value_3"); document.getElementById("value_4").innerHTML = json.data.dns_backend || "-";
input = json.data.fetch_utility; document.getElementById("value_5").innerHTML = json.data.overall_domains || "-";
view.innerHTML = input || "-"; document.getElementById("value_6").innerHTML = json.data.last_rundate || "-";
view = document.getElementById("value_4");
input = json.data.dns_backend;
view.innerHTML = input || "-";
view = document.getElementById("value_5");
input = json.data.overall_domains;
view.innerHTML = input || "-";
view = document.getElementById("value_6");
input = json.data.last_rundate;
view.innerHTML = input || "-";
} }
function btn_action(action) function btn_action(action)
@ -116,32 +106,42 @@ This is free software, licensed under the Apache License, Version 2.0
} }
} }
function reset_view()
{
document.getElementById("btn1").value = "<%:Suspend%>";
document.getElementById("btn1").name = "do_suspend";
document.getElementById("btn2").value = "<%:Refresh%>";
document.getElementById("btn2").name = "do_refresh";
document.getElementById("btn1").disabled = true;
document.getElementById("btn2").disabled = true;
document.getElementById("value_1").innerHTML = "-";
document.getElementById("value_2").innerHTML = "-";
document.getElementById("value_3").innerHTML = "-";
document.getElementById("value_4").innerHTML = "-";
document.getElementById("value_5").innerHTML = "-";
document.getElementById("value_6").innerHTML = "-";
}
XHR.get('<%=luci.dispatcher.build_url("admin", "services", "adblock", "status")%>', null, XHR.get('<%=luci.dispatcher.build_url("admin", "services", "adblock", "status")%>', null,
function(x, json_info) function(x, json_info)
{ {
if (!x || !json_info) if (!x || !json_info || !json_info.data)
{ {
var btn1 = document.getElementById("btn1"); reset_view();
var btn2 = document.getElementById("btn2");
btn1.value = "<%:Suspend%>";
btn1.name = "do_suspend";
btn2.value = "<%:Refresh%>";
btn2.name = "do_refresh";
btn1.disabled = true;
btn2.disabled = true;
return; return;
} }
status_update(json_info) status_update(json_info);
}); });
XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "status")%>', null, XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "status")%>', null,
function(x, json_info) function(x, json_info)
{ {
if (!x || !json_info) if (!x || !json_info || !json_info.data)
{ {
reset_view();
return; return;
} }
status_update(json_info) status_update(json_info);
}); });
//]]> //]]>
</script> </script>