From 171ef77e8985ffd90eb66b8a0a3cd74beb37ccdc Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 6 Aug 2020 20:58:35 +0200 Subject: treewide: remove rendundant proto handler options The introduction of network device configuration support also implemented all common, protocol-independent interface options directly in the interface config view, so drop the redundant option definitions. Signed-off-by: Jo-Philipp Wich --- .../htdocs/luci-static/resources/protocol/464xlat.js | 8 -------- .../htdocs/luci-static/resources/protocol/6in4.js | 8 -------- .../htdocs/luci-static/resources/protocol/6rd.js | 8 -------- .../htdocs/luci-static/resources/protocol/6to4.js | 8 -------- .../htdocs/luci-static/resources/protocol/dhcpv6.js | 14 -------------- .../htdocs/luci-static/resources/protocol/dslite.js | 8 -------- .../htdocs/luci-static/resources/protocol/map.js | 8 -------- 7 files changed, 62 deletions(-) (limited to 'protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol') diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js index a74708fd01..9cfdadd9a6 100644 --- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js +++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js @@ -45,14 +45,6 @@ return network.registerProtocol('464xlat', { o.nocreate = true; o.exclude = s.section; - o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured')); - o.default = o.enabled; - - o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric')); - o.placeholder = '0'; - o.datatype = 'uinteger'; - o.depends('defaultroute', '1'); - o = s.taboption('advanced', form.Value, 'mtu', _('Use MTU on tunnel interface')); o.placeholder = '1280'; o.datatype = 'max(9200)'; diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js index f26ced7b40..92540570ef 100644 --- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js +++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js @@ -82,14 +82,6 @@ return network.registerProtocol('6in4', { o.password = true; o.depends('_update', '1'); - o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured')); - o.default = o.enabled; - - o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric')); - o.placeholder = '0'; - o.datatype = 'uinteger'; - o.depends('defaultroute', '1'); - o = s.taboption('advanced', form.Value, 'ttl', _('Use TTL on tunnel interface')); o.placeholder = '64'; o.datatype = 'range(1,255)'; diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js index 6a8f506bc9..415c3a89e7 100644 --- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js +++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js @@ -62,14 +62,6 @@ return network.registerProtocol('6rd', { o.placeholder = '0'; o.datatype = 'range(0,32)'; - o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured')); - o.default = o.enabled; - - o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric')); - o.placeholder = '0'; - o.datatype = 'uinteger'; - o.depends('defaultroute', '1'); - o = s.taboption('advanced', form.Value, 'ttl', _('Use TTL on tunnel interface')); o.placeholder = '64'; o.datatype = 'range(1,255)'; diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js index abfe1c8fc4..f572562332 100644 --- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js +++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js @@ -46,14 +46,6 @@ return network.registerProtocol('6to4', { }, this)); }; - o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured')); - o.default = o.enabled; - - o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric')); - o.placeholder = '0'; - o.datatype = 'uinteger'; - o.depends('defaultroute', '1'); - o = s.taboption('advanced', form.Value, 'ttl', _('Use TTL on tunnel interface')); o.placeholder = '64'; o.datatype = 'range(1,255)'; diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js index eba58f4248..41fdc6d9d5 100644 --- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js +++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js @@ -30,20 +30,6 @@ return network.registerProtocol('dhcpv6', { o.value('64'); o.default = 'auto'; - o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured')); - o.default = o.enabled; - - o = s.taboption('advanced', form.DynamicList, 'ip6prefix', _('Custom delegated IPv6-prefix')); - o.datatype = 'cidr6'; - - o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored')); - o.default = o.enabled; - - o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers')); - o.depends('peerdns', '0'); - o.datatype = 'ipaddr'; - o.cast = 'string'; - o = s.taboption('advanced', form.Value, 'clientid', _('Client ID to send when requesting DHCP')); o.datatype = 'hexstring'; diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js index fa0e68ddc3..5f1fbf4f7a 100644 --- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js +++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js @@ -64,14 +64,6 @@ return network.registerProtocol('dslite', { for (var i = 0; i < 256; i++) o.value(i); - o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured')); - o.default = o.enabled; - - o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric')); - o.placeholder = '0'; - o.datatype = 'uinteger'; - o.depends('defaultroute', '1'); - o = s.taboption('advanced', form.Value, 'mtu', _('Use MTU on tunnel interface')); o.placeholder = '1280'; o.datatype = 'max(9200)'; diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js index 5c292af619..82e0169210 100644 --- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js +++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js @@ -77,14 +77,6 @@ return network.registerProtocol('map', { o.nocreate = true; o.exclude = s.section; - o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured')); - o.default = o.enabled; - - o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric')); - o.placeholder = '0'; - o.datatype = 'uinteger'; - o.depends('defaultroute', '1'); - o = s.taboption('advanced', form.Value, 'ttl', _('Use TTL on tunnel interface')); o.placeholder = '64'; o.datatype = 'range(1,255)'; -- cgit v1.2.3