luci-base: cbi.js: rework dropdown implementation
[project/luci.git] / modules / luci-base / htdocs / luci-static / resources / cbi.js
index fcfc5069426685da91362906040a31533765f8e7..2efa024859b55f9d577e73578fbb216ca8ca2284 100644 (file)
@@ -15,6 +15,57 @@ var cbi_d = [];
 var cbi_t = [];
 var cbi_strings = { path: {}, label: {} };
 
+function sfh(s) {
+       if (s === null || s.length === 0)
+               return null;
+
+       var hash = (s.length >>> 0),
+           len = (s.length >>> 2),
+           off = 0, tmp;
+
+       while (len--) {
+               hash += ((s.charCodeAt(off + 1) << 8) + s.charCodeAt(off)) >>> 0;
+               tmp   = ((((s.charCodeAt(off + 3) << 8) + s.charCodeAt(off + 2)) << 11) ^ hash) >>> 0;
+               hash  = ((hash << 16) ^ tmp) >>> 0;
+               hash += hash >>> 11;
+               off  += 4;
+       }
+
+       switch ((s.length & 3) >>> 0) {
+       case 3:
+               hash += ((s.charCodeAt(off + 1) << 8) + s.charCodeAt(off)) >>> 0;
+               hash  = (hash ^ (hash << 16)) >>> 0;
+               hash  = (hash ^ (s.charCodeAt(off + 2) << 18)) >>> 0;
+               hash += hash >> 11;
+               break;
+
+       case 2:
+               hash += ((s.charCodeAt(off + 1) << 8) + s.charCodeAt(off)) >>> 0;
+               hash  = (hash ^ (hash << 11)) >>> 0;
+               hash += hash >>> 17;
+               break;
+
+       case 1:
+               hash += s.charCodeAt(off);
+               hash  = (hash ^ (hash << 10)) >>> 0;
+               hash += hash >>> 1;
+               break;
+       }
+
+       hash  = (hash ^ (hash << 3)) >>> 0;
+       hash += hash >>> 5;
+       hash  = (hash ^ (hash << 4)) >>> 0;
+       hash += hash >>> 17;
+       hash  = (hash ^ (hash << 25)) >>> 0;
+       hash += hash >>> 6;
+
+       return (0x100000000 + hash).toString(16).substr(1);
+}
+
+function _(s) {
+       return (window.TR && TR[sfh(s)]) || s;
+}
+
 function Int(x) {
        return (/^-?\d+$/.test(x) ? +x : NaN);
 }
@@ -55,7 +106,8 @@ function IPv6(x) {
        var prefix = (prefix_suffix[0] || '0').split(/:/);
        var suffix = prefix_suffix.length > 1 ? (prefix_suffix[1] || '0').split(/:/) : [];
 
-       if (suffix.length ? (prefix.length + suffix.length > 7) : (prefix.length > 8))
+       if (suffix.length ? (prefix.length + suffix.length > 7)
+                         : ((prefix_suffix.length < 2 && prefix.length < 8) || prefix.length > 8))
                return null;
 
        var i, word;
@@ -79,366 +131,470 @@ function IPv6(x) {
        return words;
 }
 
-var cbi_validators = {
+var CBIValidatorPrototype = {
+       apply: function(name, value, args) {
+               var func;
 
-       'integer': function()
-       {
-               return !!Int(this);
-       },
+               if (typeof(name) === 'function')
+                       func = name;
+               else if (typeof(this.types[name]) === 'function')
+                       func = this.types[name];
+               else
+                       return false;
 
-       'uinteger': function()
-       {
-               return (Int(this) >= 0);
-       },
+               if (value !== undefined && value !== null)
+                       this.value = value;
 
-       'float': function()
-       {
-               return !!Dec(this);
+               return func.apply(this, args);
        },
 
-       'ufloat': function()
-       {
-               return (Dec(this) >= 0);
-       },
+       assert: function(condition, message) {
+               if (!condition) {
+                       this.field.classList.add('cbi-input-invalid');
+                       this.error = message;
+                       return false;
+               }
 
-       'ipaddr': function()
-       {
-               return cbi_validators.ip4addr.apply(this) ||
-                       cbi_validators.ip6addr.apply(this);
+               this.field.classList.remove('cbi-input-invalid');
+               this.error = null;
+               return true;
        },
 
-       'ip4addr': function()
-       {
-               var m = this.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(?:\/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|\/(\d{1,2}))?$/);
-               return !!(m && IPv4(m[1]) && (m[2] ? IPv4(m[2]) : (m[3] ? cbi_validators.ip4prefix.apply(m[3]) : true)));
-       },
+       compile: function(code) {
+               var pos = 0;
+               var esc = false;
+               var depth = 0;
+               var stack = [ ];
 
-       'ip6addr': function()
-       {
-               var m = this.match(/^([0-9a-fA-F:.]+)(?:\/(\d{1,3}))?$/);
-               return !!(m && IPv6(m[1]) && (m[2] ? cbi_validators.ip6prefix.apply(m[2]) : true));
-       },
+               code += ',';
 
-       'ip4prefix': function()
-       {
-               return !isNaN(this) && this >= 0 && this <= 32;
-       },
+               for (var i = 0; i < code.length; i++) {
+                       if (esc) {
+                               esc = false;
+                               continue;
+                       }
 
-       'ip6prefix': function()
-       {
-               return !isNaN(this) && this >= 0 && this <= 128;
-       },
+                       switch (code.charCodeAt(i))
+                       {
+                       case 92:
+                               esc = true;
+                               break;
 
-       'cidr': function()
-       {
-               return cbi_validators.cidr4.apply(this) ||
-                       cbi_validators.cidr6.apply(this);
-       },
+                       case 40:
+                       case 44:
+                               if (depth <= 0) {
+                                       if (pos < i) {
+                                               var label = code.substring(pos, i);
+                                                       label = label.replace(/\\(.)/g, '$1');
+                                                       label = label.replace(/^[ \t]+/g, '');
+                                                       label = label.replace(/[ \t]+$/g, '');
+
+                                               if (label && !isNaN(label)) {
+                                                       stack.push(parseFloat(label));
+                                               }
+                                               else if (label.match(/^(['"]).*\1$/)) {
+                                                       stack.push(label.replace(/^(['"])(.*)\1$/, '$2'));
+                                               }
+                                               else if (typeof this.types[label] == 'function') {
+                                                       stack.push(this.types[label]);
+                                                       stack.push(null);
+                                               }
+                                               else {
+                                                       throw "Syntax error, unhandled token '"+label+"'";
+                                               }
+                                       }
 
-       'cidr4': function()
-       {
-               var m = this.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\/(\d{1,2})$/);
-               return !!(m && IPv4(m[1]) && cbi_validators.ip4prefix.apply(m[2]));
-       },
+                                       pos = i+1;
+                               }
 
-       'cidr6': function()
-       {
-               var m = this.match(/^([0-9a-fA-F:.]+)\/(\d{1,3})$/);
-               return !!(m && IPv6(m[1]) && cbi_validators.ip6prefix.apply(m[2]));
-       },
+                               depth += (code.charCodeAt(i) == 40);
+                               break;
 
-       'ipnet4': function()
-       {
-               var m = this.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/);
-               return !!(m && IPv4(m[1]) && IPv4(m[2]));
-       },
+                       case 41:
+                               if (--depth <= 0) {
+                                       if (typeof stack[stack.length-2] != 'function')
+                                               throw "Syntax error, argument list follows non-function";
 
-       'ipnet6': function()
-       {
-               var m = this.match(/^([0-9a-fA-F:.]+)\/([0-9a-fA-F:.]+)$/);
-               return !!(m && IPv6(m[1]) && IPv6(m[2]));
-       },
+                                       stack[stack.length-1] = this.compile(code.substring(pos, i));
+                                       pos = i+1;
+                               }
 
-       'ip6hostid': function()
-       {
-               if (this == "eui64" || this == "random")
-                       return true;
+                               break;
+                       }
+               }
 
-               var v6 = IPv6(this);
-               return !(!v6 || v6[0] || v6[1] || v6[2] || v6[3]);
+               return stack;
        },
 
-       'ipmask': function()
-       {
-               return cbi_validators.ipmask4.apply(this) ||
-                       cbi_validators.ipmask6.apply(this);
-       },
+       validate: function() {
+               /* element is detached */
+               if (!this.field.form)
+                       return true;
 
-       'ipmask4': function()
-       {
-               return cbi_validators.cidr4.apply(this) ||
-                       cbi_validators.ipnet4.apply(this) ||
-                       cbi_validators.ip4addr.apply(this);
-       },
+               this.field.classList.remove('cbi-input-invalid');
+               this.value = matchesElem(this.field, 'select') ? this.field.options[this.field.selectedIndex].value : this.field.value;
+               this.error = null;
 
-       'ipmask6': function()
-       {
-               return cbi_validators.cidr6.apply(this) ||
-                       cbi_validators.ipnet6.apply(this) ||
-                       cbi_validators.ip6addr.apply(this);
-       },
+               var valid;
 
-       'port': function()
-       {
-               var p = Int(this);
-               return (p >= 0 && p <= 65535);
-       },
+               if (this.value.length === 0)
+                       valid = this.assert(this.optional, _('non-empty value'));
+               else
+                       valid = this.vstack[0].apply(this, this.vstack[1]);
 
-       'portrange': function()
-       {
-               if (this.match(/^(\d+)-(\d+)$/))
-               {
-                       var p1 = +RegExp.$1;
-                       var p2 = +RegExp.$2;
-                       return (p1 <= p2 && p2 <= 65535);
+               if (!valid) {
+                       this.field.setAttribute('data-tooltip', 'Expecting ' + this.error);
+                       this.field.setAttribute('data-tooltip-style', 'error');
+                       this.field.dispatchEvent(new CustomEvent('validation-failure', { bubbles: true }));
+               }
+               else {
+                       this.field.removeAttribute('data-tooltip');
+                       this.field.removeAttribute('data-tooltip-style');
+                       this.field.dispatchEvent(new CustomEvent('validation-success', { bubbles: true }));
                }
 
-               return cbi_validators.port.apply(this);
-       },
-
-       'macaddr': function()
-       {
-               return (this.match(/^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/) != null);
-       },
-
-       'host': function(ipv4only)
-       {
-               return cbi_validators.hostname.apply(this) ||
-                       ((ipv4only != 1) && cbi_validators.ipaddr.apply(this)) ||
-                       ((ipv4only == 1) && cbi_validators.ip4addr.apply(this));
+               return valid;
        },
 
-       'hostname': function(strict)
-       {
-               if (this.length <= 253)
-                       return (this.match(/^[a-zA-Z0-9_]+$/) != null ||
-                               (this.match(/^[a-zA-Z0-9_][a-zA-Z0-9_\-.]*[a-zA-Z0-9]$/) &&
-                                this.match(/[^0-9.]/))) &&
-                              (!strict || !this.match(/^_/));
+       types: {
+               integer: function() {
+                       return this.assert(Int(this.value) !== NaN, _('valid integer value'));
+               },
+
+               uinteger: function() {
+                       return this.assert(Int(this.value) >= 0, _('positive integer value'));
+               },
+
+               float: function() {
+                       return this.assert(Dec(this.value) !== NaN, _('valid decimal value'));
+               },
+
+               ufloat: function() {
+                       return this.assert(Dec(this.value) >= 0, _('positive decimal value'));
+               },
+
+               ipaddr: function(nomask) {
+                       return this.assert(this.apply('ip4addr', null, [nomask]) || this.apply('ip6addr', null, [nomask]),
+                               nomask ? _('valid IP address') : _('valid IP address or prefix'));
+               },
+
+               ip4addr: function(nomask) {
+                       var re = nomask ? /^(\d+\.\d+\.\d+\.\d+)$/ : /^(\d+\.\d+\.\d+\.\d+)(?:\/(\d+\.\d+\.\d+\.\d+)|\/(\d{1,2}))?$/,
+                           m = this.value.match(re);
+
+                       return this.assert(m && IPv4(m[1]) && (m[2] ? IPv4(m[2]) : (m[3] ? this.apply('ip4prefix', m[3]) : true)),
+                               nomask ? _('valid IPv4 address') : _('valid IPv4 address or network'));
+               },
+
+               ip6addr: function(nomask) {
+                       var re = nomask ? /^([0-9a-fA-F:.]+)$/ : /^([0-9a-fA-F:.]+)(?:\/(\d{1,3}))?$/,
+                           m = this.value.match(re);
+
+                       return this.assert(m && IPv6(m[1]) && (m[2] ? this.apply('ip6prefix', m[2]) : true),
+                               nomask ? _('valid IPv6 address') : _('valid IPv6 address or prefix'));
+               },
+
+               ip4prefix: function() {
+                       return this.assert(!isNaN(this.value) && this.value >= 0 && this.value <= 32,
+                               _('valid IPv4 prefix value (0-32)'));
+               },
+
+               ip6prefix: function() {
+                       return this.assert(!isNaN(this.value) && this.value >= 0 && this.value <= 128,
+                               _('valid IPv6 prefix value (0-128)'));
+               },
+
+               cidr: function() {
+                       return this.assert(this.apply('cidr4') || this.apply('cidr6'), _('valid IPv4 or IPv6 CIDR'));
+               },
+
+               cidr4: function() {
+                       var m = this.value.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\/(\d{1,2})$/);
+                       return this.assert(m && IPv4(m[1]) && this.apply('ip4prefix', m[2]), _('valid IPv4 CIDR'));
+               },
+
+               cidr6: function() {
+                       var m = this.value.match(/^([0-9a-fA-F:.]+)\/(\d{1,3})$/);
+                       return this.assert(m && IPv6(m[1]) && this.apply('ip6prefix', m[2]), _('valid IPv6 CIDR'));
+               },
+
+               ipnet4: function() {
+                       var m = this.value.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/);
+                       return this.assert(m && IPv4(m[1]) && IPv4(m[2]), _('IPv4 network in address/netmask notation'));
+               },
+
+               ipnet6: function() {
+                       var m = this.value.match(/^([0-9a-fA-F:.]+)\/([0-9a-fA-F:.]+)$/);
+                       return this.assert(m && IPv6(m[1]) && IPv6(m[2]), _('IPv6 network in address/netmask notation'));
+               },
+
+               ip6hostid: function() {
+                       if (this.value == "eui64" || this.value == "random")
+                               return true;
 
-               return false;
-       },
+                       var v6 = IPv6(this.value);
+                       return this.assert(!(!v6 || v6[0] || v6[1] || v6[2] || v6[3]), _('valid IPv6 host id'));
+               },
+
+               ipmask: function() {
+                       return this.assert(this.apply('ipmask4') || this.apply('ipmask6'),
+                               _('valid network in address/netmask notation'));
+               },
+
+               ipmask4: function() {
+                       return this.assert(this.apply('cidr4') || this.apply('ipnet4') || this.apply('ip4addr'),
+                               _('valid IPv4 network'));
+               },
+
+               ipmask6: function() {
+                       return this.assert(this.apply('cidr6') || this.apply('ipnet6') || this.apply('ip6addr'),
+                               _('valid IPv6 network'));
+               },
+
+               port: function() {
+                       var p = Int(this.value);
+                       return this.assert(p >= 0 && p <= 65535, _('valid port value'));
+               },
+
+               portrange: function() {
+                       if (this.value.match(/^(\d+)-(\d+)$/)) {
+                               var p1 = +RegExp.$1;
+                               var p2 = +RegExp.$2;
+                               return this.assert(p1 <= p2 && p2 <= 65535,
+                                       _('valid port or port range (port1-port2)'));
+                       }
 
-       'network': function()
-       {
-               return cbi_validators.uciname.apply(this) ||
-                       cbi_validators.host.apply(this);
-       },
+                       return this.assert(this.apply('port'), _('valid port or port range (port1-port2)'));
+               },
+
+               macaddr: function() {
+                       return this.assert(this.value.match(/^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/) != null,
+                               _('valid MAC address'));
+               },
+
+               host: function(ipv4only) {
+                       return this.assert(this.apply('hostname') || this.apply(ipv4only == 1 ? 'ip4addr' : 'ipaddr'),
+                               _('valid hostname or IP address'));
+               },
+
+               hostname: function(strict) {
+                       if (this.value.length <= 253)
+                               return this.assert(
+                                       (this.value.match(/^[a-zA-Z0-9_]+$/) != null ||
+                                               (this.value.match(/^[a-zA-Z0-9_][a-zA-Z0-9_\-.]*[a-zA-Z0-9]$/) &&
+                                                this.value.match(/[^0-9.]/))) &&
+                                       (!strict || !this.value.match(/^_/)),
+                                       _('valid hostname'));
+
+                       return this.assert(false, _('valid hostname'));
+               },
+
+               network: function() {
+                       return this.assert(this.apply('uciname') || this.apply('host'),
+                               _('valid UCI identifier, hostname or IP address'));
+               },
+
+               hostport: function(ipv4only) {
+                       var hp = this.value.split(/:/);
+                       return this.assert(hp.length == 2 && this.apply('host', hp[0], [ipv4only]) && this.apply('port', hp[1]),
+                               _('valid host:port'));
+               },
+
+               ip4addrport: function() {
+                       var hp = this.value.split(/:/);
+                       return this.assert(hp.length == 2 && this.apply('ip4addr', hp[0], [true]) && this.apply('port', hp[1]),
+                               _('valid IPv4 address:port'));
+               },
+
+               ipaddrport: function(bracket) {
+                       var m4 = this.value.match(/^([^\[\]:]+):(\d+)$/),
+                           m6 = this.value.match((bracket == 1) ? /^\[(.+)\]:(\d+)$/ : /^([^\[\]]+):(\d+)$/);
+
+                       if (m4)
+                               return this.assert(this.apply('ip4addr', m4[0], [true]) && this.apply('port', m4[1]),
+                                       _('valid address:port'));
+
+                       return this.assert(m6 && this.apply('ip6addr', m6[0], [true]) && this.apply('port', m6[1]),
+                               _('valid address:port'));
+               },
+
+               wpakey: function() {
+                       var v = this.value;
+
+                       if (v.length == 64)
+                               return this.assert(v.match(/^[a-fA-F0-9]{64}$/), _('valid hexadecimal WPA key'));
+
+                       return this.assert((v.length >= 8) && (v.length <= 63), _('key between 8 and 63 characters'));
+               },
+
+               wepkey: function() {
+                       var v = this.value;
+
+                       if (v.substr(0, 2) === 's:')
+                               v = v.substr(2);
+
+                       if ((v.length == 10) || (v.length == 26))
+                               return this.assert(v.match(/^[a-fA-F0-9]{10,26}$/), _('valid hexadecimal WEP key'));
+
+                       return this.assert((v.length === 5) || (v.length === 13), _('key with either 5 or 13 characters'));
+               },
+
+               uciname: function() {
+                       return this.assert(this.value.match(/^[a-zA-Z0-9_]+$/), _('valid UCI identifier'));
+               },
+
+               range: function(min, max) {
+                       var val = Dec(this.value);
+                       return this.assert(val >= +min && val <= +max, _('value between %f and %f').format(min, max));
+               },
+
+               min: function(min) {
+                       return this.assert(Dec(this.value) >= +min, _('value greater or equal to %f').format(min));
+               },
+
+               max: function(max) {
+                       return this.assert(Dec(this.value) <= +max, _('value smaller or equal to %f').format(max));
+               },
+
+               rangelength: function(min, max) {
+                       var val = '' + this.value;
+                       return this.assert((val.length >= +min) && (val.length <= +max),
+                               _('value between %d and %d characters').format(min, max));
+               },
+
+               minlength: function(min) {
+                       return this.assert((''+this.value).length >= +min,
+                               _('value with at least %d characters').format(min));
+               },
+
+               maxlength: function(max) {
+                       return this.assert((''+this.value).length <= +max,
+                               _('value with at most %d characters').format(max));
+               },
+
+               or: function() {
+                       var errors = [];
+
+                       for (var i = 0; i < arguments.length; i += 2) {
+                               if (typeof arguments[i] != 'function') {
+                                       if (arguments[i] == this.value)
+                                               return this.assert(true);
+                                       errors.push('"%s"'.format(arguments[i]));
+                                       i--;
+                               }
+                               else if (arguments[i].apply(this, arguments[i+1])) {
+                                       return this.assert(true);
+                               }
+                               else {
+                                       errors.push(this.error);
+                               }
+                       }
 
-       'hostport': function(ipv4only)
-       {
-               var hp = this.split(/:/);
+                       return this.assert(false, _('one of:\n - %s'.format(errors.join('\n - '))));
+               },
 
-               if (hp.length == 2)
-                       return (cbi_validators.host.apply(hp[0], ipv4only) &&
-                               cbi_validators.port.apply(hp[1]));
+               and: function() {
+                       for (var i = 0; i < arguments.length; i += 2) {
+                               if (typeof arguments[i] != 'function') {
+                                       if (arguments[i] != this.value)
+                                               return this.assert(false, '"%s"'.format(arguments[i]));
+                                       i--;
+                               }
+                               else if (!arguments[i].apply(this, arguments[i+1])) {
+                                       return this.assert(false, this.error);
+                               }
+                       }
 
-               return false;
-       },
+                       return this.assert(true);
+               },
 
-       'ip4addrport': function()
-       {
-               var hp = this.split(/:/);
+               neg: function() {
+                       return this.apply('or', this.value.replace(/^[ \t]*![ \t]*/, ''), arguments);
+               },
 
-               if (hp.length == 2)
-                       return (cbi_validators.ipaddr.apply(hp[0]) &&
-                               cbi_validators.port.apply(hp[1]));
-               return false;
-       },
+               list: function(subvalidator, subargs) {
+                       this.field.setAttribute('data-is-list', 'true');
 
-       'ipaddrport': function(bracket)
-       {
-               if (this.match(/^([^\[\]:]+):([^:]+)$/)) {
-                       var addr = RegExp.$1
-                       var port = RegExp.$2
-                       return (cbi_validators.ip4addr.apply(addr) &&
-                               cbi_validators.port.apply(port));
-                } else if ((bracket == 1) && (this.match(/^\[(.+)\]:([^:]+)$/))) {
-                       var addr = RegExp.$1
-                       var port = RegExp.$2
-                       return (cbi_validators.ip6addr.apply(addr) &&
-                               cbi_validators.port.apply(port));
-                } else if ((bracket != 1) && (this.match(/^([^\[\]]+):([^:]+)$/))) {
-                       var addr = RegExp.$1
-                       var port = RegExp.$2
-                       return (cbi_validators.ip6addr.apply(addr) &&
-                               cbi_validators.port.apply(port));
-               } else {
-                       return false;
-               }
-       },
+                       var tokens = this.value.match(/[^ \t]+/g);
+                       for (var i = 0; i < tokens.length; i++)
+                               if (!this.apply(subvalidator, tokens[i], subargs))
+                                       return this.assert(false, this.error);
 
-       'wpakey': function()
-       {
-               var v = this;
+                       return this.assert(true);
+               },
 
-               if( v.length == 64 )
-                       return (v.match(/^[a-fA-F0-9]{64}$/) != null);
-               else
-                       return (v.length >= 8) && (v.length <= 63);
-       },
+               phonedigit: function() {
+                       return this.assert(this.value.match(/^[0-9\*#!\.]+$/),
+                               _('valid phone digit (0-9, "*", "#", "!" or ".")'));
+               },
 
-       'wepkey': function()
-       {
-               var v = this;
+               timehhmmss: function() {
+                       return this.assert(this.value.match(/^[0-6][0-9]:[0-6][0-9]:[0-6][0-9]$/),
+                               _('valid time (HH:MM:SS'));
+               },
 
-               if ( v.substr(0,2) == 's:' )
-                       v = v.substr(2);
+               dateyyyymmdd: function() {
+                       if (this.value.match(/^(\d\d\d\d)-(\d\d)-(\d\d)/)) {
+                               var year  = +RegExp.$1,
+                                   month = +RegExp.$2,
+                                   day   = +RegExp.$3,
+                                   days_in_month = [ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ];
 
-               if( (v.length == 10) || (v.length == 26) )
-                       return (v.match(/^[a-fA-F0-9]{10,26}$/) != null);
-               else
-                       return (v.length == 5) || (v.length == 13);
-       },
+                               function is_leap_year(year) {
+                                       return ((!(year % 4) && (year % 100)) || !(year % 400));
+                               }
 
-       'uciname': function()
-       {
-               return (this.match(/^[a-zA-Z0-9_]+$/) != null);
-       },
+                               function get_days_in_month(month, year) {
+                                       return (month === 2 && is_leap_year(year)) ? 29 : days_in_month[month - 1];
+                               }
 
-       'range': function(min, max)
-       {
-               var val = Dec(this);
-               return (val >= +min && val <= +max);
-       },
+                               /* Firewall rules in the past don't make sense */
+                               return this.assert(year >= 2015 && month && month <= 12 && day && day <= get_days_in_month(month, year),
+                                       _('valid date (YYYY-MM-DD)'));
 
-       'min': function(min)
-       {
-               return (Dec(this) >= +min);
-       },
+                       }
 
-       'max': function(max)
-       {
-               return (Dec(this) <= +max);
-       },
+                       return this.assert(false, _('valid date (YYYY-MM-DD)'));
+               },
 
-       'rangelength': function(min, max)
-       {
-               var val = '' + this;
-               return ((val.length >= +min) && (val.length <= +max));
-       },
+               unique: function(subvalidator, subargs) {
+                       var ctx = this,
+                               option = findParent(ctx.field, '[data-type][data-name]'),
+                           section = findParent(option, '.cbi-section'),
+                           query = '[data-type="%s"][data-name="%s"]'.format(option.getAttribute('data-type'), option.getAttribute('data-name')),
+                           unique = true;
 
-       'minlength': function(min)
-       {
-               return ((''+this).length >= +min);
-       },
+                       section.querySelectorAll(query).forEach(function(sibling) {
+                               if (sibling === option)
+                                       return;
 
-       'maxlength': function(max)
-       {
-               return ((''+this).length <= +max);
-       },
+                               var input = sibling.querySelector('[data-type]'),
+                                   values = input.getAttribute('data-is-list') ? input.value.match(/[^ \t]+/g) : [ input.value ];
 
-       'or': function()
-       {
-               for (var i = 0; i < arguments.length; i += 2)
-               {
-                       if (typeof arguments[i] != 'function')
-                       {
-                               if (arguments[i] == this)
-                                       return true;
-                               i--;
-                       }
-                       else if (arguments[i].apply(this, arguments[i+1]))
-                       {
-                               return true;
-                       }
-               }
-               return false;
-       },
-
-       'and': function()
-       {
-               for (var i = 0; i < arguments.length; i += 2)
-               {
-                       if (typeof arguments[i] != 'function')
-                       {
-                               if (arguments[i] != this)
-                                       return false;
-                               i--;
-                       }
-                       else if (!arguments[i].apply(this, arguments[i+1]))
-                       {
-                               return false;
-                       }
-               }
-               return true;
-       },
-
-       'neg': function()
-       {
-               return cbi_validators.or.apply(
-                       this.replace(/^[ \t]*![ \t]*/, ''), arguments);
-       },
-
-       'list': function(subvalidator, subargs)
-       {
-               if (typeof subvalidator != 'function')
-                       return false;
+                               if (values !== null && values.indexOf(ctx.value) !== -1)
+                                       unique = false;
+                       });
 
-               var tokens = this.match(/[^ \t]+/g);
-               for (var i = 0; i < tokens.length; i++)
-                       if (!subvalidator.apply(tokens[i], subargs))
-                               return false;
+                       if (!unique)
+                               return this.assert(false, _('unique value'));
 
-               return true;
-       },
-       'phonedigit': function()
-       {
-               return (this.match(/^[0-9\*#!\.]+$/) != null);
-       },
-       'timehhmmss': function()
-       {
-               return (this.match(/^[0-6][0-9]:[0-6][0-9]:[0-6][0-9]$/) != null);
-       },
-       'dateyyyymmdd': function()
-       {
-               if (this == null) {
-                       return false;
-               }
-               if (this.match(/^(\d\d\d\d)-(\d\d)-(\d\d)/)) {
-                       var year = RegExp.$1;
-                       var month = RegExp.$2;
-                       var day = RegExp.$2
-
-                       var days_in_month = [ 31, 28, 31, 30, 31, 30, 31, 31, 30 , 31, 30, 31 ];
-                       function is_leap_year(year) {
-                               return ((year % 4) == 0) && ((year % 100) != 0) || ((year % 400) == 0);
-                       }
-                       function get_days_in_month(month, year) {
-                               if ((month == 2) && is_leap_year(year)) {
-                                       return 29;
-                               } else {
-                                       return days_in_month[month];
-                               }
-                       }
-                       /* Firewall rules in the past don't make sense */
-                       if (year < 2015) {
-                               return false;
-                       }
-                       if ((month <= 0) || (month > 12)) {
-                               return false;
-                       }
-                       if ((day <= 0) || (day > get_days_in_month(month, year))) {
-                               return false;
-                       }
-                       return true;
+                       if (typeof(subvalidator) === 'function')
+                               return this.apply(subvalidator, undefined, subargs);
 
-               } else {
-                       return false;
+                       return this.assert(true);
                }
        }
 };
 
+function CBIValidator(field, type, optional)
+{
+       this.field = field;
+       this.optional = optional;
+       this.vstack = this.compile(type);
+}
+
+CBIValidator.prototype = CBIValidatorPrototype;
+
 
 function cbi_d_add(field, dep, index) {
        var obj = (typeof(field) === 'string') ? document.getElementById(field) : field;
@@ -511,20 +667,19 @@ function cbi_d_update() {
                if (node && node.parentNode && !cbi_d_check(entry.deps)) {
                        node.parentNode.removeChild(node);
                        state = true;
-               } else if (parent && (!node || !node.parentNode) && cbi_d_check(entry.deps)) {
+               }
+               else if (parent && (!node || !node.parentNode) && cbi_d_check(entry.deps)) {
                        var next = undefined;
 
                        for (next = parent.firstChild; next; next = next.nextSibling) {
-                               if (next.getAttribute && parseInt(next.getAttribute('data-index'), 10) > entry.index) {
+                               if (next.getAttribute && parseInt(next.getAttribute('data-index'), 10) > entry.index)
                                        break;
-                               }
                        }
 
-                       if (!next) {
+                       if (!next)
                                parent.appendChild(entry.node);
-                       } else {
+                       else
                                parent.insertBefore(entry.node, next);
-                       }
 
                        state = true;
                }
@@ -539,9 +694,8 @@ function cbi_d_update() {
                        cbi_tag_last(parent);
        }
 
-       if (state) {
+       if (state)
                cbi_d_update();
-       }
 }
 
 function cbi_init() {
@@ -565,9 +719,8 @@ function cbi_init() {
                var index = parseInt(node.getAttribute('data-index'), 10);
                var depends = JSON.parse(node.getAttribute('data-depends'));
                if (!isNaN(index) && depends.length > 0) {
-                       for (var alt = 0; alt < depends.length; alt++) {
+                       for (var alt = 0; alt < depends.length; alt++)
                                cbi_d_add(node, depends[alt], index);
-                       }
                }
        }
 
@@ -575,9 +728,8 @@ function cbi_init() {
 
        for (var i = 0, node; (node = nodes[i]) !== undefined; i++) {
                var events = node.getAttribute('data-update').split(' ');
-               for (var j = 0, event; (event = events[j]) !== undefined; j++) {
-                       cbi_bind(node, event, cbi_d_update);
-               }
+               for (var j = 0, event; (event = events[j]) !== undefined; j++)
+                       node.addEventListener(event, cbi_d_update);
        }
 
        nodes = document.querySelectorAll('[data-choices]');
@@ -642,24 +794,6 @@ function cbi_init() {
        cbi_d_update();
 }
 
-function cbi_bind(obj, type, callback, mode) {
-       if (!obj.addEventListener) {
-               obj.attachEvent('on' + type,
-                       function(){
-                               var e = window.event;
-
-                               if (!e.target && e.srcElement)
-                                       e.target = e.srcElement;
-
-                               return !!callback(e);
-                       }
-               );
-       } else {
-               obj.addEventListener(type, callback, !!mode);
-       }
-       return obj;
-}
-
 function cbi_combobox(id, values, def, man, focus) {
        var selid = "cbi.combobox." + id;
        if (document.getElementById(selid)) {
@@ -670,13 +804,13 @@ function cbi_combobox(id, values, def, man, focus) {
        var sel = document.createElement("select");
                sel.id = selid;
                sel.index = obj.index;
-               sel.className = obj.className.replace(/cbi-input-text/, 'cbi-input-select');
+               sel.classList.remove('cbi-input-text');
+               sel.classList.add('cbi-input-select');
 
-       if (obj.nextSibling) {
+       if (obj.nextSibling)
                obj.parentNode.insertBefore(sel, obj.nextSibling);
-       } else {
+       else
                obj.parentNode.appendChild(sel);
-       }
 
        var dt = obj.getAttribute('cbi_datatype');
        var op = obj.getAttribute('cbi_optional');
@@ -685,9 +819,10 @@ function cbi_combobox(id, values, def, man, focus) {
                if (obj.value == "") {
                        var optdef = document.createElement("option");
                        optdef.value = "";
-                       optdef.appendChild(document.createTextNode(typeof(def) === 'string' ? def : cbi_strings.label.choose));
+                       optdef.appendChild(document.createTextNode(typeof(def) === 'string' ? def : _('-- Please choose --')));
                        sel.appendChild(optdef);
-               } else {
+               }
+               else {
                        var opt = document.createElement("option");
                        opt.value = obj.value;
                        opt.selected = "selected";
@@ -700,9 +835,8 @@ function cbi_combobox(id, values, def, man, focus) {
                var opt = document.createElement("option");
                opt.value = i;
 
-               if (obj.value == i) {
+               if (obj.value == i)
                        opt.selected = "selected";
-               }
 
                opt.appendChild(document.createTextNode(values[i]));
                sel.appendChild(opt);
@@ -710,7 +844,7 @@ function cbi_combobox(id, values, def, man, focus) {
 
        var optman = document.createElement("option");
        optman.value = "";
-       optman.appendChild(document.createTextNode(typeof(man) === 'string' ? man : cbi_strings.label.custom));
+       optman.appendChild(document.createTextNode(typeof(man) === 'string' ? man : _('-- custom --')));
        sel.appendChild(optman);
 
        obj.style.display = "none";
@@ -718,13 +852,14 @@ function cbi_combobox(id, values, def, man, focus) {
        if (dt)
                cbi_validate_field(sel, op == 'true', dt);
 
-       cbi_bind(sel, "change", function() {
+       sel.addEventListener("change", function() {
                if (sel.selectedIndex == sel.options.length - 1) {
                        obj.style.display = "inline";
                        sel.blur();
                        sel.parentNode.removeChild(sel);
                        obj.focus();
-               } else {
+               }
+               else {
                        obj.value = sel.options[sel.selectedIndex].value;
                }
 
@@ -744,7 +879,7 @@ function cbi_combobox(id, values, def, man, focus) {
 
 function cbi_combobox_init(id, values, def, man) {
        var obj = (typeof(id) === 'string') ? document.getElementById(id) : id;
-       cbi_bind(obj, "blur", function() {
+       obj.addEventListener("blur", function() {
                cbi_combobox(obj.id, values, def, man, true);
        });
        cbi_combobox(obj.id, values, def, man, false);
@@ -774,7 +909,7 @@ function cbi_browser_init(id, resource, defpath)
        btn.src = (resource || cbi_strings.path.resource) + '/cbi/folder.gif';
        field.parentNode.insertBefore(btn, field.nextSibling);
 
-       cbi_bind(btn, 'click', cbi_browser_btnclick);
+       btn.addEventListener('click', cbi_browser_btnclick);
 }
 
 function cbi_dynlist_init(parent, datatype, optional, choices)
@@ -788,35 +923,30 @@ function cbi_dynlist_init(parent, datatype, optional, choices)
        {
                values = [ ];
 
-               while (parent.firstChild)
-               {
+               while (parent.firstChild) {
                        var n = parent.firstChild;
                        var i = +n.index;
 
-                       if (i != del)
-                       {
-                               if (n.nodeName.toLowerCase() == 'input')
+                       if (i != del) {
+                               if (matchesElem(n, 'input'))
                                        values.push(n.value || '');
-                               else if (n.nodeName.toLowerCase() == 'select')
+                               else if (matchesElem(n, 'select'))
                                        values[values.length-1] = n.options[n.selectedIndex].value;
                        }
 
                        parent.removeChild(n);
                }
 
-               if (add >= 0)
-               {
+               if (add >= 0) {
                        focus = add+1;
                        values.splice(focus, 0, '');
                }
-               else if (values.length == 0)
-               {
+               else if (values.length == 0) {
                        focus = 0;
                        values.push('');
                }
 
-               for (var i = 0; i < values.length; i++)
-               {
+               for (var i = 0; i < values.length; i++) {
                        var t = document.createElement('input');
                                t.id = prefix + '.' + (i+1);
                                t.name = prefix;
@@ -826,9 +956,7 @@ function cbi_dynlist_init(parent, datatype, optional, choices)
                                t.className = 'cbi-input-text';
 
                        if (i == 0 && holder)
-                       {
                                t.placeholder = holder;
-                       }
 
                        var b = E('div', {
                                class: 'cbi-button cbi-button-' + ((i+1) < values.length ? 'remove' : 'add')
@@ -836,40 +964,33 @@ function cbi_dynlist_init(parent, datatype, optional, choices)
 
                        parent.appendChild(t);
                        parent.appendChild(b);
+
                        if (datatype == 'file')
-                       {
                                cbi_browser_init(t.id, null, parent.getAttribute('data-browser-path'));
-                       }
 
                        parent.appendChild(document.createElement('br'));
 
                        if (datatype)
-                       {
                                cbi_validate_field(t.id, ((i+1) == values.length) || optional, datatype);
-                       }
 
-                       if (choices)
-                       {
-                               cbi_combobox_init(t.id, choices, '', cbi_strings.label.custom);
+                       if (choices) {
+                               cbi_combobox_init(t.id, choices, '', _('-- custom --'));
                                b.index = i;
 
-                               cbi_bind(b, 'keydown',  cbi_dynlist_keydown);
-                               cbi_bind(b, 'keypress', cbi_dynlist_keypress);
+                               b.addEventListener('keydown',  cbi_dynlist_keydown);
+                               b.addEventListener('keypress', cbi_dynlist_keypress);
 
                                if (i == focus || -i == focus)
                                        b.focus();
                        }
-                       else
-                       {
-                               cbi_bind(t, 'keydown',  cbi_dynlist_keydown);
-                               cbi_bind(t, 'keypress', cbi_dynlist_keypress);
+                       else {
+                               t.addEventListener('keydown',  cbi_dynlist_keydown);
+                               t.addEventListener('keypress', cbi_dynlist_keypress);
 
-                               if (i == focus)
-                               {
+                               if (i == focus) {
                                        t.focus();
                                }
-                               else if (-i == focus)
-                               {
+                               else if (-i == focus) {
                                        t.focus();
 
                                        /* force cursor to end */
@@ -879,7 +1000,7 @@ function cbi_dynlist_init(parent, datatype, optional, choices)
                                }
                        }
 
-                       cbi_bind(b, 'click', cbi_dynlist_btnclick);
+                       b.addEventListener('click', cbi_dynlist_btnclick);
                }
        }
 
@@ -892,13 +1013,11 @@ function cbi_dynlist_init(parent, datatype, optional, choices)
                if (se.nodeType == 3)
                        se = se.parentNode;
 
-               switch (ev.keyCode)
-               {
+               switch (ev.keyCode) {
                        /* backspace, delete */
                        case 8:
                        case 46:
-                               if (se.value.length == 0)
-                               {
+                               if (se.value.length == 0) {
                                        if (ev.preventDefault)
                                                ev.preventDefault();
 
@@ -941,16 +1060,14 @@ function cbi_dynlist_init(parent, datatype, optional, choices)
                if (next && next.nextSibling.name == prefix)
                        next = next.nextSibling;
 
-               switch (ev.keyCode)
-               {
+               switch (ev.keyCode) {
                        /* backspace, delete */
                        case 8:
                        case 46:
-                               var del = (se.nodeName.toLowerCase() == 'select')
+                               var del = (matchesElem(se, 'select'))
                                        ? true : (se.value.length == 0);
 
-                               if (del)
-                               {
+                               if (del) {
                                        if (ev.preventDefault)
                                                ev.preventDefault();
 
@@ -994,9 +1111,8 @@ function cbi_dynlist_init(parent, datatype, optional, choices)
 
                var se = ev.target ? ev.target : ev.srcElement;
                var input = se.previousSibling;
-               while (input && input.name != prefix) {
+               while (input && input.name != prefix)
                        input = input.previousSibling;
-               }
 
                if (se.classList.contains('cbi-button-remove')) {
                        input.value = '';
@@ -1024,39 +1140,45 @@ function cbi_t_add(section, tab) {
        var t = document.getElementById('tab.' + section + '.' + tab);
        var c = document.getElementById('container.' + section + '.' + tab);
 
-       if( t && c ) {
+       if (t && c) {
                cbi_t[section] = (cbi_t[section] || [ ]);
                cbi_t[section][tab] = { 'tab': t, 'container': c, 'cid': c.id };
        }
 }
 
 function cbi_t_switch(section, tab) {
-       if( cbi_t[section] && cbi_t[section][tab] ) {
+       if (cbi_t[section] && cbi_t[section][tab]) {
                var o = cbi_t[section][tab];
                var h = document.getElementById('tab.' + section);
-               for( var tid in cbi_t[section] ) {
+
+               for (var tid in cbi_t[section]) {
                        var o2 = cbi_t[section][tid];
-                       if( o.tab.id != o2.tab.id ) {
-                               o2.tab.className = o2.tab.className.replace(/(^| )cbi-tab( |$)/, " cbi-tab-disabled ");
+
+                       if (o.tab.id != o2.tab.id) {
+                               o2.tab.classList.remove('cbi-tab');
+                               o2.tab.classList.add('cbi-tab-disabled');
                                o2.container.style.display = 'none';
                        }
                        else {
-                               if(h) h.value = tab;
-                               o2.tab.className = o2.tab.className.replace(/(^| )cbi-tab-disabled( |$)/, " cbi-tab ");
+                               if(h)
+                                       h.value = tab;
+
+                               o2.tab.classList.remove('cbi-tab-disabled');
+                               o2.tab.classList.add('cbi-tab');
                                o2.container.style.display = 'block';
                        }
                }
        }
-       return false
+
+       return false;
 }
 
 function cbi_t_update() {
        var hl_tabs = [ ];
        var updated = false;
 
-       for( var sid in cbi_t )
-               for( var tid in cbi_t[sid] )
-               {
+       for (var sid in cbi_t)
+               for (var tid in cbi_t[sid]) {
                        var t = cbi_t[sid][tid].tab;
                        var c = cbi_t[sid][tid].container;
 
@@ -1065,7 +1187,7 @@ function cbi_t_update() {
                        }
                        else if (t.style.display == 'none') {
                                t.style.display = '';
-                               t.className += ' cbi-tab-highlighted';
+                               t.classList.add('cbi-tab-highlighted');
                                hl_tabs.push(t);
                        }
 
@@ -1075,8 +1197,8 @@ function cbi_t_update() {
 
        if (hl_tabs.length > 0)
                window.setTimeout(function() {
-                       for( var i = 0; i < hl_tabs.length; i++ )
-                               hl_tabs[i].className = hl_tabs[i].className.replace(/ cbi-tab-highlighted/g, '');
+                       for (var i = 0; i < hl_tabs.length; i++)
+                               hl_tabs[i].classList.remove('cbi-tab-highlighted');
                }, 750);
 
        return updated;
@@ -1086,16 +1208,14 @@ function cbi_t_update() {
 function cbi_validate_form(form, errmsg)
 {
        /* if triggered by a section removal or addition, don't validate */
-       if( form.cbi_state == 'add-section' || form.cbi_state == 'del-section' )
+       if (form.cbi_state == 'add-section' || form.cbi_state == 'del-section')
                return true;
 
-       if( form.cbi_validators )
-       {
-               for( var i = 0; i < form.cbi_validators.length; i++ )
-               {
+       if (form.cbi_validators) {
+               for (var i = 0; i < form.cbi_validators.length; i++) {
                        var validator = form.cbi_validators[i];
-                       if( !validator() && errmsg )
-                       {
+
+                       if (!validator() && errmsg) {
                                alert(errmsg);
                                return false;
                        }
@@ -1114,129 +1234,41 @@ function cbi_validate_reset(form)
        return true;
 }
 
-function cbi_validate_compile(code)
-{
-       var pos = 0;
-       var esc = false;
-       var depth = 0;
-       var stack = [ ];
-
-       code += ',';
-
-       for (var i = 0; i < code.length; i++)
-       {
-               if (esc)
-               {
-                       esc = false;
-                       continue;
-               }
-
-               switch (code.charCodeAt(i))
-               {
-               case 92:
-                       esc = true;
-                       break;
-
-               case 40:
-               case 44:
-                       if (depth <= 0)
-                       {
-                               if (pos < i)
-                               {
-                                       var label = code.substring(pos, i);
-                                               label = label.replace(/\\(.)/g, '$1');
-                                               label = label.replace(/^[ \t]+/g, '');
-                                               label = label.replace(/[ \t]+$/g, '');
-
-                                       if (label && !isNaN(label))
-                                       {
-                                               stack.push(parseFloat(label));
-                                       }
-                                       else if (label.match(/^(['"]).*\1$/))
-                                       {
-                                               stack.push(label.replace(/^(['"])(.*)\1$/, '$2'));
-                                       }
-                                       else if (typeof cbi_validators[label] == 'function')
-                                       {
-                                               stack.push(cbi_validators[label]);
-                                               stack.push(null);
-                                       }
-                                       else
-                                       {
-                                               throw "Syntax error, unhandled token '"+label+"'";
-                                       }
-                               }
-                               pos = i+1;
-                       }
-                       depth += (code.charCodeAt(i) == 40);
-                       break;
-
-               case 41:
-                       if (--depth <= 0)
-                       {
-                               if (typeof stack[stack.length-2] != 'function')
-                                       throw "Syntax error, argument list follows non-function";
-
-                               stack[stack.length-1] =
-                                       arguments.callee(code.substring(pos, i));
-
-                               pos = i+1;
-                       }
-                       break;
-               }
-       }
-
-       return stack;
-}
-
 function cbi_validate_field(cbid, optional, type)
 {
-       var field = (typeof cbid == "string") ? document.getElementById(cbid) : cbid;
-       var vstack; try { vstack = cbi_validate_compile(type); } catch(e) { };
-
-       if (field && vstack && typeof vstack[0] == "function")
-       {
-               var validator = function()
-               {
-                       // is not detached
-                       if( field.form )
-                       {
-                               field.className = field.className.replace(/ cbi-input-invalid/g, '');
+       var field = isElem(cbid) ? cbid : document.getElementById(cbid);
+       var validatorFn;
 
-                               // validate value
-                               var value = (field.options && field.options.selectedIndex > -1)
-                                       ? field.options[field.options.selectedIndex].value : field.value;
-
-                               if (!(((value.length == 0) && optional) || vstack[0].apply(value, vstack[1])))
-                               {
-                                       // invalid
-                                       field.className += ' cbi-input-invalid';
-                                       return false;
-                               }
-                       }
+       try {
+               var cbiValidator = new CBIValidator(field, type, optional);
 
-                       return true;
+               validatorFn = function() {
+                       return cbiValidator.validate();
                };
+       }
+       catch(e) {
+               validatorFn = null;
+       };
 
-               if( ! field.form.cbi_validators )
+       if (validatorFn !== null) {
+               if (!field.form.cbi_validators)
                        field.form.cbi_validators = [ ];
 
-               field.form.cbi_validators.push(validator);
+               field.form.cbi_validators.push(validatorFn);
 
-               cbi_bind(field, "blur",  validator);
-               cbi_bind(field, "keyup", validator);
+               field.addEventListener("blur",  validatorFn);
+               field.addEventListener("keyup", validatorFn);
 
-               if (field.nodeName == 'SELECT')
-               {
-                       cbi_bind(field, "change", validator);
-                       cbi_bind(field, "click",  validator);
+               if (matchesElem(field, 'select')) {
+                       field.addEventListener("change", validatorFn);
+                       field.addEventListener("click",  validatorFn);
                }
 
-               field.setAttribute("cbi_validate", validator);
+               field.setAttribute("cbi_validate", validatorFn);
                field.setAttribute("cbi_datatype", type);
                field.setAttribute("cbi_optional", (!!optional).toString());
 
-               validator();
+               validatorFn();
 
                var fcbox = document.getElementById('cbi.combobox.' + field.id);
                if (fcbox)
@@ -1291,7 +1323,8 @@ function cbi_row_swap(elem, up, store)
                input.value = ids.join(' ');
 
        window.scrollTo(0, tr.offsetTop);
-       window.setTimeout(function() { tr.classList.add('flash'); }, 1);
+       void tr.offsetWidth;
+       tr.classList.add('flash');
 
        return false;
 }
@@ -1300,20 +1333,16 @@ function cbi_tag_last(container)
 {
        var last;
 
-       for (var i = 0; i < container.childNodes.length; i++)
-       {
+       for (var i = 0; i < container.childNodes.length; i++) {
                var c = container.childNodes[i];
-               if (c.nodeType == 1 && c.nodeName.toLowerCase() == 'div')
-               {
-                       c.className = c.className.replace(/ cbi-value-last$/, '');
+               if (matchesElem(c, 'div')) {
+                       c.classList.remove('cbi-value-last');
                        last = c;
                }
        }
 
        if (last)
-       {
-               last.className += ' cbi-value-last';
-       }
+               last.classList.add('cbi-value-last');
 }
 
 function cbi_submit(elem, name, value, action)
@@ -1350,8 +1379,9 @@ String.prototype.format = function()
                if (typeof(s) !== 'string' && !(s instanceof String))
                        return '';
 
-               for( var i = 0; i < r.length; i += 2 )
+               for (var i = 0; i < r.length; i += 2)
                        s = s.replace(r[i], r[i+1]);
+
                return s;
        }
 
@@ -1360,22 +1390,18 @@ String.prototype.format = function()
        var re = /^(([^%]*)%('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X|q|h|j|t|m))/;
        var a = b = [], numSubstitutions = 0, numMatches = 0;
 
-       while (a = re.exec(str))
-       {
+       while (a = re.exec(str)) {
                var m = a[1];
                var leftpart = a[2], pPad = a[3], pJustify = a[4], pMinLength = a[5];
                var pPrecision = a[6], pType = a[7];
 
                numMatches++;
 
-               if (pType == '%')
-               {
+               if (pType == '%') {
                        subst = '%';
                }
-               else
-               {
-                       if (numSubstitutions < arguments.length)
-                       {
+               else {
+                       if (numSubstitutions < arguments.length) {
                                var param = arguments[numSubstitutions++];
 
                                var pad = '';
@@ -1400,8 +1426,7 @@ String.prototype.format = function()
 
                                var subst = param;
 
-                               switch(pType)
-                               {
+                               switch(pType) {
                                        case 'b':
                                                subst = (+param || 0).toString(2);
                                                break;
@@ -1517,16 +1542,20 @@ String.prototype.nobr = function()
 String.format = function()
 {
        var a = [ ];
+
        for (var i = 1; i < arguments.length; i++)
                a.push(arguments[i]);
+
        return ''.format.apply(arguments[0], a);
 }
 
 String.nobr = function()
 {
        var a = [ ];
+
        for (var i = 1; i < arguments.length; i++)
                a.push(arguments[i]);
+
        return ''.nobr.apply(arguments[0], a);
 }
 
@@ -1569,12 +1598,19 @@ function toElem(s)
        return elem || null;
 }
 
+function matchesElem(node, selector)
+{
+       return ((node.matches && node.matches(selector)) ||
+               (node.msMatchesSelector && node.msMatchesSelector(selector)));
+}
+
 function findParent(node, selector)
 {
+       if (node.closest)
+               return node.closest(selector);
+
        while (node)
-               if (node.msMatchesSelector && node.msMatchesSelector(selector))
-                       return node;
-               else if (node.matches && node.matches(selector))
+               if (matchesElem(node, selector))
                        return node;
                else
                        node = node.parentNode;
@@ -1651,16 +1687,30 @@ CBIDropdown = {
                        s.dispatchEvent(new CustomEvent('cbi-dropdown-close', {}));
                });
 
-               ul.style.maxHeight = mh + 'px';
                sb.setAttribute('open', '');
 
-               ul.scrollTop = sel ? Math.max(sel.offsetTop - sel.offsetHeight, 0) : 0;
+               if ('ontouchstart' in window) {
+                       var scroll = document.documentElement.scrollTop,
+                           vpWidth = Math.max(document.documentElement.clientWidth, window.innerWidth || 0),
+                           vpHeight = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
+
+                       ul.style.top = h + 'px';
+                       ul.style.left = -rect.left + 'px';
+                       ul.style.right = (rect.right - vpWidth) + 'px';
+
+                       window.scrollTo(0, (scroll + rect.top - vpHeight * 0.6));
+               }
+               else {
+                       ul.style.maxHeight = mh + 'px';
+                       ul.scrollTop = sel ? Math.max(sel.offsetTop - sel.offsetHeight, 0) : 0;
+                       ul.style.top = ul.style.bottom = '';
+                       ul.style[((rect.top + rect.height + eh) > window.innerHeight) ? 'bottom' : 'top'] = rect.height + 'px';
+               }
+
                ul.querySelectorAll('[selected] input[type="checkbox"]').forEach(function(c) {
                        c.checked = true;
                });
 
-               ul.style.top = ul.style.bottom = '';
-               ul.style[((sb.getBoundingClientRect().top + eh) > window.innerHeight) ? 'bottom' : 'top'] = rect.height + 'px';
                ul.classList.add('dropdown');
 
                var pv = ul.cloneNode(true);
@@ -1791,29 +1841,80 @@ CBIDropdown = {
        },
 
        saveValues: function(sb, ul) {
-               var sel = ul.querySelectorAll('[selected]'),
-                   div = sb.lastElementChild;
+               var sel = ul.querySelectorAll('li[selected]'),
+                   div = sb.lastElementChild,
+                   values = [];
 
                while (div.lastElementChild)
                        div.removeChild(div.lastElementChild);
 
                sel.forEach(function (s) {
+                       if (s.hasAttribute('placeholder'))
+                               return;
+
                        div.appendChild(E('input', {
                                type: 'hidden',
                                name: s.hasAttribute('name') ? s.getAttribute('name') : (sb.getAttribute('name') || ''),
-                               value: s.hasAttribute('value') ? s.getAttribute('value') : s.innerText
+                               value: s.hasAttribute('data-value') ? s.getAttribute('data-value') : s.innerText
                        }));
+
+                       values.push({
+                               text: s.innerText,
+                               value: s.hasAttribute('data-value') ? s.getAttribute('data-value') : s.innerText,
+                               element: s
+                       });
                });
 
+               var detail = {
+                       instance: this,
+                       element: sb
+               };
+
+               if (this.mult)
+                       detail.values = values;
+               else
+                       detail.value = values.length ? values[0] : null;
+
+               sb.dispatchEvent(new CustomEvent('cbi-dropdown-change', {
+                       bubbles: true,
+                       detail: detail
+               }));
+
                cbi_d_update();
        },
 
+       setValues: function(sb, values) {
+               var ul = sb.querySelector('ul');
+
+               if (this.multi) {
+                       ul.querySelectorAll('li[data-value]').forEach(function(li) {
+                               if (values === null || !(li.getAttribute('data-value') in values))
+                                       this.toggleItem(sb, li, false);
+                               else
+                                       this.toggleItem(sb, li, true);
+                       });
+               }
+               else {
+                       var ph = ul.querySelector('li[placeholder]');
+                       if (ph)
+                               this.toggleItem(sb, ph);
+
+                       ul.querySelectorAll('li[data-value]').forEach(function(li) {
+                               if (values !== null && (li.getAttribute('data-value') in values))
+                                       this.toggleItem(sb, li);
+                       });
+               }
+       },
+
        setFocus: function(sb, elem, scroll) {
                if (sb && sb.hasAttribute && sb.hasAttribute('locked-in'))
                        return;
 
+               if (sb.target && findParent(sb.target, 'ul.dropdown'))
+                       return;
+
                document.querySelectorAll('.focus').forEach(function(e) {
-                       if (e.nodeName.toLowerCase() !== 'input') {
+                       if (!matchesElem(e, 'input')) {
                                e.classList.remove('focus');
                                e.blur();
                        }
@@ -1836,11 +1937,14 @@ CBIDropdown = {
                if (!sbox.multi)
                        val.length = Math.min(val.length, 1);
 
+               if (val.length === 1 && val[0].length === 0)
+                       val.length = 0;
+
                val.forEach(function(item) {
                        var new_item = null;
 
                        ul.childNodes.forEach(function(li) {
-                               if (li.getAttribute && li.getAttribute('value') === item)
+                               if (li.getAttribute && li.getAttribute('data-value') === item)
                                        new_item = li;
                        });
 
@@ -1851,7 +1955,7 @@ CBIDropdown = {
                                if (tpl)
                                        markup = (tpl.textContent || tpl.innerHTML || tpl.firstChild.data).replace(/^<!--|-->$/, '').trim();
                                else
-                                       markup = '<li value="{{value}}">{{value}}</li>';
+                                       markup = '<li data-value="{{value}}">{{value}}</li>';
 
                                new_item = E(markup.replace(/{{value}}/g, item));
 
@@ -1878,6 +1982,166 @@ CBIDropdown = {
                document.querySelectorAll('.cbi-dropdown[open]').forEach(function(s) {
                        s.dispatchEvent(new CustomEvent('cbi-dropdown-close', {}));
                });
+       },
+
+       handleClick: function(ev) {
+               var sb = ev.currentTarget;
+
+               if (!sb.hasAttribute('open')) {
+                       if (!matchesElem(ev.target, 'input'))
+                               this.openDropdown(sb);
+               }
+               else {
+                       var li = findParent(ev.target, 'li');
+                       if (li && li.parentNode.classList.contains('dropdown'))
+                               this.toggleItem(sb, li);
+               }
+
+               ev.preventDefault();
+               ev.stopPropagation();
+       },
+
+       handleKeydown: function(ev) {
+               var sb = ev.currentTarget;
+
+               if (matchesElem(ev.target, 'input'))
+                       return;
+
+               if (!sb.hasAttribute('open')) {
+                       switch (ev.keyCode) {
+                       case 37:
+                       case 38:
+                       case 39:
+                       case 40:
+                               this.openDropdown(sb);
+                               ev.preventDefault();
+                       }
+               }
+               else {
+                       var active = findParent(document.activeElement, 'li');
+
+                       switch (ev.keyCode) {
+                       case 27:
+                               this.closeDropdown(sb);
+                               break;
+
+                       case 13:
+                               if (active) {
+                                       if (!active.hasAttribute('selected'))
+                                               this.toggleItem(sb, active);
+                                       this.closeDropdown(sb);
+                                       ev.preventDefault();
+                               }
+                               break;
+
+                       case 32:
+                               if (active) {
+                                       this.toggleItem(sb, active);
+                                       ev.preventDefault();
+                               }
+                               break;
+
+                       case 38:
+                               if (active && active.previousElementSibling) {
+                                       this.setFocus(sb, active.previousElementSibling);
+                                       ev.preventDefault();
+                               }
+                               break;
+
+                       case 40:
+                               if (active && active.nextElementSibling) {
+                                       this.setFocus(sb, active.nextElementSibling);
+                                       ev.preventDefault();
+                               }
+                               break;
+                       }
+               }
+       },
+
+       handleDropdownClose: function(ev) {
+               var sb = ev.currentTarget;
+
+               this.closeDropdown(sb, true);
+       },
+
+       handleDropdownSelect: function(ev) {
+               var sb = ev.currentTarget,
+                   li = findParent(ev.target, 'li');
+
+               if (!li)
+                       return;
+
+               this.toggleItem(sb, li);
+               this.closeDropdown(sb, true);
+       },
+
+       handleMouseover: function(ev) {
+               var sb = ev.currentTarget;
+
+               if (!sb.hasAttribute('open'))
+                       return;
+
+               var li = findParent(ev.target, 'li');
+
+               if (li && li.parentNode.classList.contains('dropdown'))
+                       this.setFocus(sb, li);
+       },
+
+       handleFocus: function(ev) {
+               var sb = ev.currentTarget;
+
+               document.querySelectorAll('.cbi-dropdown[open]').forEach(function(s) {
+                       if (s !== sb || sb.hasAttribute('open'))
+                               s.dispatchEvent(new CustomEvent('cbi-dropdown-close', {}));
+               });
+       },
+
+       handleCanaryFocus: function(ev) {
+               this.closeDropdown(ev.currentTarget.parentNode);
+       },
+
+       handleCreateKeydown: function(ev) {
+               var input = ev.currentTarget,
+                   sb = findParent(input, '.cbi-dropdown');
+
+               switch (ev.keyCode) {
+               case 13:
+                       ev.preventDefault();
+
+                       if (input.classList.contains('cbi-input-invalid'))
+                               return;
+
+                       this.createItems(sb, input.value);
+                       input.value = '';
+                       input.blur();
+                       break;
+               }
+       },
+
+       handleCreateFocus: function(ev) {
+               var input = ev.currentTarget,
+                   cbox = findParent(input, 'li').querySelector('input[type="checkbox"]'),
+                   sb = findParent(input, '.cbi-dropdown');
+
+               if (cbox)
+                       cbox.checked = true;
+
+               sb.setAttribute('locked-in', '');
+       },
+
+       handleCreateBlur: function(ev) {
+               var input = ev.currentTarget,
+                   cbox = findParent(input, 'li').querySelector('input[type="checkbox"]'),
+                   sb = findParent(input, '.cbi-dropdown');
+
+               if (cbox)
+                       cbox.checked = false;
+
+               sb.removeAttribute('locked-in');
+       },
+
+       handleCreateClick: function(ev) {
+               ev.currentTarget.querySelector(this.create).focus();
        }
 };
 
@@ -1893,9 +2157,7 @@ function cbi_dropdown_init(sb) {
        this.create = sb.getAttribute('item-create') || '.create-item-input';
        this.template = sb.getAttribute('item-template') || 'script[type="item-template"]';
 
-       var sbox = this,
-           ul = sb.querySelector('ul'),
-           items = ul.querySelectorAll('li'),
+       var ul = sb.querySelector('ul'),
            more = sb.appendChild(E('span', { class: 'more', tabindex: -1 }, '···')),
            open = sb.appendChild(E('span', { class: 'open', tabindex: -1 }, '▾')),
            canary = sb.appendChild(E('div')),
@@ -1904,15 +2166,23 @@ function cbi_dropdown_init(sb) {
            n = 0;
 
        if (this.multi) {
+               var items = ul.querySelectorAll('li');
+
                for (var i = 0; i < items.length; i++) {
-                       sbox.transformItem(sb, items[i]);
+                       this.transformItem(sb, items[i]);
 
                        if (items[i].hasAttribute('selected') && ndisplay-- > 0)
                                items[i].setAttribute('display', n++);
                }
        }
        else {
-               var sel = sb.querySelectorAll('[selected]');
+               if (this.optional && !ul.querySelector('li[data-value=""]')) {
+                       var placeholder = E('li', { placeholder: '' }, this.placeholder);
+                       ul.firstChild ? ul.insertBefore(placeholder, ul.firstChild) : ul.appendChild(placeholder);
+               }
+
+               var items = ul.querySelectorAll('li'),
+                   sel = sb.querySelectorAll('[selected]');
 
                sel.forEach(function(s) {
                        s.removeAttribute('selected');
@@ -1925,14 +2195,9 @@ function cbi_dropdown_init(sb) {
                }
 
                ndisplay--;
-
-               if (this.optional && !ul.querySelector('li[value=""]')) {
-                       var placeholder = E('li', { placeholder: '' }, this.placeholder);
-                       ul.firstChild ? ul.insertBefore(placeholder, ul.firstChild) : ul.appendChild(placeholder);
-               }
        }
 
-       sbox.saveValues(sb, ul);
+       this.saveValues(sb, ul);
 
        ul.setAttribute('tabindex', -1);
        sb.setAttribute('tabindex', 0);
@@ -1950,151 +2215,41 @@ function cbi_dropdown_init(sb) {
        more.innerHTML = (ndisplay === this.display_items) ? this.placeholder : '···';
 
 
-       sb.addEventListener('click', function(ev) {
-               if (!this.hasAttribute('open')) {
-                       if (ev.target.nodeName.toLowerCase() !== 'input')
-                               sbox.openDropdown(this);
-               }
-               else {
-                       var li = findParent(ev.target, 'li');
-                       if (li && li.parentNode.classList.contains('dropdown'))
-                               sbox.toggleItem(this, li);
-               }
-
-               ev.preventDefault();
-               ev.stopPropagation();
-       });
-
-       sb.addEventListener('keydown', function(ev) {
-               if (ev.target.nodeName.toLowerCase() === 'input')
-                       return;
-
-               if (!this.hasAttribute('open')) {
-                       switch (ev.keyCode) {
-                       case 37:
-                       case 38:
-                       case 39:
-                       case 40:
-                               sbox.openDropdown(this);
-                               ev.preventDefault();
-                       }
-               }
-               else
-               {
-                       var active = findParent(document.activeElement, 'li');
-
-                       switch (ev.keyCode) {
-                       case 27:
-                               sbox.closeDropdown(this);
-                               break;
-
-                       case 13:
-                               if (active) {
-                                       if (!active.hasAttribute('selected'))
-                                               sbox.toggleItem(this, active);
-                                       sbox.closeDropdown(this);
-                                       ev.preventDefault();
-                               }
-                               break;
-
-                       case 32:
-                               if (active) {
-                                       sbox.toggleItem(this, active);
-                                       ev.preventDefault();
-                               }
-                               break;
-
-                       case 38:
-                               if (active && active.previousElementSibling) {
-                                       sbox.setFocus(this, active.previousElementSibling);
-                                       ev.preventDefault();
-                               }
-                               break;
-
-                       case 40:
-                               if (active && active.nextElementSibling) {
-                                       sbox.setFocus(this, active.nextElementSibling);
-                                       ev.preventDefault();
-                               }
-                               break;
-                       }
-               }
-       });
-
-       sb.addEventListener('cbi-dropdown-close', function(ev) {
-               sbox.closeDropdown(this, true);
-       });
+       sb.addEventListener('click', this.handleClick.bind(this));
+       sb.addEventListener('keydown', this.handleKeydown.bind(this));
+       sb.addEventListener('cbi-dropdown-close', this.handleDropdownClose.bind(this));
+       sb.addEventListener('cbi-dropdown-select', this.handleDropdownSelect.bind(this));
 
        if ('ontouchstart' in window) {
                sb.addEventListener('touchstart', function(ev) { ev.stopPropagation(); });
-               window.addEventListener('touchstart', sbox.closeAllDropdowns);
+               window.addEventListener('touchstart', this.closeAllDropdowns);
        }
        else {
-               sb.addEventListener('mouseover', function(ev) {
-                       if (!this.hasAttribute('open'))
-                               return;
-
-                       var li = findParent(ev.target, 'li');
-                       if (li) {
-                               if (li.parentNode.classList.contains('dropdown'))
-                                       sbox.setFocus(this, li);
-
-                               ev.stopPropagation();
-                       }
-               });
-
-               sb.addEventListener('focus', function(ev) {
-                       document.querySelectorAll('.cbi-dropdown[open]').forEach(function(s) {
-                               if (s !== this || this.hasAttribute('open'))
-                                       s.dispatchEvent(new CustomEvent('cbi-dropdown-close', {}));
-                       });
-               });
+               sb.addEventListener('mouseover', this.handleMouseover.bind(this));
+               sb.addEventListener('focus', this.handleFocus.bind(this));
 
-               canary.addEventListener('focus', function(ev) {
-                       sbox.closeDropdown(this.parentNode);
-               });
+               canary.addEventListener('focus', this.handleCanaryFocus.bind(this));
 
-               window.addEventListener('mouseover', sbox.setFocus);
-               window.addEventListener('click', sbox.closeAllDropdowns);
+               window.addEventListener('mouseover', this.setFocus);
+               window.addEventListener('click', this.closeAllDropdowns);
        }
 
        if (create) {
-               create.addEventListener('keydown', function(ev) {
-                       switch (ev.keyCode) {
-                       case 13:
-                               sbox.createItems(sb, this.value);
-                               ev.preventDefault();
-                               this.value = '';
-                               this.blur();
-                               break;
-                       }
-               });
-
-               create.addEventListener('focus', function(ev) {
-                       var cbox = findParent(this, 'li').querySelector('input[type="checkbox"]');
-                       if (cbox) cbox.checked = true;
-                       sb.setAttribute('locked-in', '');
-               });
-
-               create.addEventListener('blur', function(ev) {
-                       var cbox = findParent(this, 'li').querySelector('input[type="checkbox"]');
-                       if (cbox) cbox.checked = false;
-                       sb.removeAttribute('locked-in');
-               });
+               create.addEventListener('keydown', this.handleCreateKeydown.bind(this));
+               create.addEventListener('focus', this.handleCreateFocus.bind(this));
+               create.addEventListener('blur', this.handleCreateBlur.bind(this));
 
                var li = findParent(create, 'li');
 
                li.setAttribute('unselectable', '');
-               li.addEventListener('click', function(ev) {
-                       this.querySelector(sbox.create).focus();
-               });
+               li.addEventListener('click', this.handleCreateClick.bind(this));
        }
 }
 
 cbi_dropdown_init.prototype = CBIDropdown;
 
 function cbi_update_table(table, data, placeholder) {
-       target = isElem(table) ? table : document.querySelector(table);
+       var target = isElem(table) ? table : document.querySelector(table);
 
        if (!isElem(target))
                return;
@@ -2163,6 +2318,68 @@ function cbi_update_table(table, data, placeholder) {
        });
 }
 
+var tooltipDiv = null, tooltipTimeout = null;
+
+function showTooltip(ev) {
+       if (!matchesElem(ev.target, '[data-tooltip]'))
+               return;
+
+       if (tooltipTimeout !== null) {
+               window.clearTimeout(tooltipTimeout);
+               tooltipTimeout = null;
+       }
+
+       var rect = ev.target.getBoundingClientRect(),
+           x = rect.left              + window.pageXOffset,
+           y = rect.top + rect.height + window.pageYOffset;
+
+       tooltipDiv.className = 'cbi-tooltip';
+       tooltipDiv.innerHTML = '▲ ';
+       tooltipDiv.firstChild.data += ev.target.getAttribute('data-tooltip');
+
+       if (ev.target.hasAttribute('data-tooltip-style'))
+               tooltipDiv.classList.add(ev.target.getAttribute('data-tooltip-style'));
+
+       if ((y + tooltipDiv.offsetHeight) > (window.innerHeight + window.pageYOffset)) {
+               y -= (tooltipDiv.offsetHeight + ev.target.offsetHeight);
+               tooltipDiv.firstChild.data = '▼ ' + tooltipDiv.firstChild.data.substr(2);
+       }
+
+       tooltipDiv.style.top = y + 'px';
+       tooltipDiv.style.left = x + 'px';
+       tooltipDiv.style.opacity = 1;
+}
+
+function hideTooltip(ev) {
+       if (ev.target === tooltipDiv || ev.relatedTarget === tooltipDiv)
+               return;
+
+       if (tooltipTimeout !== null) {
+               window.clearTimeout(tooltipTimeout);
+               tooltipTimeout = null;
+       }
+
+       tooltipDiv.style.opacity = 0;
+       tooltipTimeout = window.setTimeout(function() { tooltipDiv.removeAttribute('style'); }, 250);
+}
+
 document.addEventListener('DOMContentLoaded', function() {
+       tooltipDiv = document.body.appendChild(E('div', { 'class': 'cbi-tooltip' }));
+
+       document.addEventListener('mouseover', showTooltip, true);
+       document.addEventListener('mouseout', hideTooltip, true);
+       document.addEventListener('focus', showTooltip, true);
+       document.addEventListener('blur', hideTooltip, true);
+
+       document.addEventListener('validation-failure', function(ev) {
+               if (ev.target === document.activeElement)
+                       showTooltip(ev);
+       });
+
+       document.addEventListener('validation-success', function(ev) {
+               if (ev.target === document.activeElement)
+                       hideTooltip(ev);
+       });
+
        document.querySelectorAll('.table').forEach(cbi_update_table);
 });