diff options
| author | Dirk Brenken <dev@brenken.org> | 2018-11-28 13:59:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 13:59:30 +0100 |
| commit | 98cde82e4d585e432efcb468a3e4cdc52b685a25 (patch) | |
| tree | d25aae16991caf9e15124f33cde16890f3614be8 | |
| parent | 7669791300245c42d5a3088d1c4500662f1a684f (diff) | |
| parent | 8db75255f7def8af500ecc6c711c66b8b17c78de (diff) | |
Merge pull request #2342 from dibdot/fw
luci-app-firewall: remove hinting
| -rw-r--r-- | applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm | 20 | ||||
| -rw-r--r-- | applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm | 17 |
2 files changed, 2 insertions, 35 deletions
diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm index 1bb86821e..38f36b49c 100644 --- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm +++ b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm @@ -76,30 +76,12 @@ var n = document.getElementById('_newfwd.name'); var p = document.getElementById('_newfwd.proto'); var i = document.getElementById('_newfwd.intport'); - var hints = { - /* port name 0=both, 1=tcp, 2=udp, 3=other */ - 21: [ 'FTP', 1 ], - 22: [ 'SSH', 1 ], - 53: [ 'DNS', 0 ], - 80: [ 'HTTP', 1 ], - 443: [ 'HTTPS', 1 ], - 3389: [ 'RDP', 1 ], - 5900: [ 'VNC', 1 ], - }; if (!this.className.match(/invalid/)) { if (!i.value) i.value = this.value; - var hint = hints[this.value || 0] || hints[i.value || 0]; - if (hint) - { - p.selectedIndex = hint[1]; - - if (!n.value) - n.value = hint[0]; - } - else if (!n.value) + if (!n.value) { n.value = 'Forward' + this.value; } diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm index c02fc20f9..e0092a7a5 100644 --- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm +++ b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm @@ -76,25 +76,10 @@ function() { var n = document.getElementById('_newopen.name'); var p = document.getElementById('_newopen.proto'); - var hints = { - /* port name 0=both, 1=tcp, 2=udp, 3=other */ - 22: [ 'SSH', 1 ], - 53: [ 'DNS', 0 ], - 80: [ 'HTTP', 1 ], - 443: [ 'HTTPS', 1 ], - }; if (!this.className.match(/invalid/)) { - var hint = hints[this.value || 0]; - if (hint) - { - p.selectedIndex = hint[1]; - - if (!n.value) - n.value = hint[0]; - } - else if (!n.value && this.value) + if (!n.value && this.value) { n.value = 'Open' + this.value; } |