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

Merge pull request #2425 from cshoredaniel/pr-fix-ipaddrport-js

Browse source 
luci-base: Fix addr:port validate always fails
This commit is contained in:
Jo-Philipp Wich 2019-01-11 07:19:27 +01:00 committed by GitHub
commit e3fa766b58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/luci-base/htdocs/luci-static/resources/cbi.js
View file

@ -443,10 +443,10 @@ var CBIValidatorPrototype = {
m6 = this.value.match((bracket == 1) ? /^\[(.+)\]:(\d+)$/ : /^([^\[\]]+):(\d+)$/); m6 = this.value.match((bracket == 1) ? /^\[(.+)\]:(\d+)$/ : /^([^\[\]]+):(\d+)$/);
if (m4) if (m4)
return this.assert(this.apply('ip4addr', m4[0], [true]) && this.apply('port', m4[1]), return this.assert(this.apply('ip4addr', m4[1], [true]) && this.apply('port', m4[2]),
_('valid address:port')); _('valid address:port'));
return this.assert(m6 && this.apply('ip6addr', m6[0], [true]) && this.apply('port', m6[1]), return this.assert(m6 && this.apply('ip6addr', m6[1], [true]) && this.apply('port', m6[2]),
_('valid address:port')); _('valid address:port'));
}, },