Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result
[oweals/luci.git] / modules / luci-base / htdocs / luci-static / resources / cbi.js
index 7248c517798e3fe9c1a8ac77e92c5f1325c054f0..4c3128bfd12272027c9f4deca9b6e7068086a18d 100644 (file)
@@ -2,7 +2,7 @@
        LuCI - Lua Configuration Interface
 
        Copyright 2008 Steven Barth <steven@midlink.org>
-       Copyright 2008-2012 Jo-Philipp Wich <jow@openwrt.org>
+       Copyright 2008-2018 Jo-Philipp Wich <jo@mein.io>
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
 */
 
 var cbi_d = [];
-var cbi_t = [];
 var cbi_strings = { path: {}, label: {} };
 
+function s8(bytes, off) {
+       var n = bytes[off];
+       return (n > 0x7F) ? (n - 256) >>> 0 : n;
+}
+
+function u16(bytes, off) {
+       return ((bytes[off + 1] << 8) + bytes[off]) >>> 0;
+}
+
 function sfh(s) {
        if (s === null || s.length === 0)
                return null;
 
-       var hash = (s.length >>> 0),
-           len = (s.length >>> 2),
+       var bytes = [];
+
+       for (var i = 0; i < s.length; i++) {
+               var ch = s.charCodeAt(i);
+
+               if (ch <= 0x7F)
+                       bytes.push(ch);
+               else if (ch <= 0x7FF)
+                       bytes.push(((ch >>>  6) & 0x1F) | 0xC0,
+                                  ( ch         & 0x3F) | 0x80);
+               else if (ch <= 0xFFFF)
+                       bytes.push(((ch >>> 12) & 0x0F) | 0xE0,
+                                  ((ch >>>  6) & 0x3F) | 0x80,
+                                  ( ch         & 0x3F) | 0x80);
+               else if (code <= 0x10FFFF)
+                       bytes.push(((ch >>> 18) & 0x07) | 0xF0,
+                                  ((ch >>> 12) & 0x3F) | 0x80,
+                                  ((ch >>   6) & 0x3F) | 0x80,
+                                  ( ch         & 0x3F) | 0x80);
+       }
+
+       if (!bytes.length)
+               return null;
+
+       var hash = (bytes.length >>> 0),
+           len = (bytes.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 += u16(bytes, off);
+               tmp   = ((u16(bytes, off + 2) << 11) ^ hash) >>> 0;
                hash  = ((hash << 16) ^ tmp) >>> 0;
                hash += hash >>> 11;
                off  += 4;
        }
 
-       switch ((s.length & 3) >>> 0) {
+       switch ((bytes.length & 3) >>> 0) {
        case 3:
-               hash += ((s.charCodeAt(off + 1) << 8) + s.charCodeAt(off)) >>> 0;
+               hash += u16(bytes, off);
                hash  = (hash ^ (hash << 16)) >>> 0;
-               hash  = (hash ^ (s.charCodeAt(off + 2) << 18)) >>> 0;
-               hash += hash >> 11;
+               hash  = (hash ^ (s8(bytes, off + 2) << 18)) >>> 0;
+               hash += hash >>> 11;
                break;
 
        case 2:
-               hash += ((s.charCodeAt(off + 1) << 8) + s.charCodeAt(off)) >>> 0;
+               hash += u16(bytes, off);
                hash  = (hash ^ (hash << 11)) >>> 0;
                hash += hash >>> 17;
                break;
 
        case 1:
-               hash += s.charCodeAt(off);
+               hash += s8(bytes, off);
                hash  = (hash ^ (hash << 10)) >>> 0;
                hash += hash >>> 1;
                break;
@@ -66,535 +98,6 @@ function _(s) {
        return (window.TR && TR[sfh(s)]) || s;
 }
 
-function Int(x) {
-       return (/^-?\d+$/.test(x) ? +x : NaN);
-}
-
-function Dec(x) {
-       return (/^-?\d+(?:\.\d+)?$/.test(x) ? +x : NaN);
-}
-
-function IPv4(x) {
-       if (!x.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/))
-               return null;
-
-       if (RegExp.$1 > 255 || RegExp.$2 > 255 || RegExp.$3 > 255 || RegExp.$4 > 255)
-               return null;
-
-       return [ +RegExp.$1, +RegExp.$2, +RegExp.$3, +RegExp.$4 ];
-}
-
-function IPv6(x) {
-       if (x.match(/^([a-fA-F0-9:]+):(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/)) {
-               var v6 = RegExp.$1, v4 = IPv4(RegExp.$2);
-
-               if (!v4)
-                       return null;
-
-               x = v6 + ':' + (v4[0] * 256 + v4[1]).toString(16)
-                      + ':' + (v4[2] * 256 + v4[3]).toString(16);
-       }
-
-       if (!x.match(/^[a-fA-F0-9:]+$/))
-               return null;
-
-       var prefix_suffix = x.split(/::/);
-
-       if (prefix_suffix.length > 2)
-               return null;
-
-       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_suffix.length < 2 && prefix.length < 8) || prefix.length > 8))
-               return null;
-
-       var i, word;
-       var words = [];
-
-       for (i = 0, word = parseInt(prefix[0], 16); i < prefix.length; word = parseInt(prefix[++i], 16))
-               if (prefix[i].length <= 4 && !isNaN(word) && word <= 0xFFFF)
-                       words.push(word);
-               else
-                       return null;
-
-       for (i = 0; i < (8 - prefix.length - suffix.length); i++)
-               words.push(0);
-
-       for (i = 0, word = parseInt(suffix[0], 16); i < suffix.length; word = parseInt(suffix[++i], 16))
-               if (suffix[i].length <= 4 && !isNaN(word) && word <= 0xFFFF)
-                       words.push(word);
-               else
-                       return null;
-
-       return words;
-}
-
-var CBIValidatorPrototype = {
-       apply: function(name, value, args) {
-               var func;
-
-               if (typeof(name) === 'function')
-                       func = name;
-               else if (typeof(this.types[name]) === 'function')
-                       func = this.types[name];
-               else
-                       return false;
-
-               if (value !== undefined && value !== null)
-                       this.value = value;
-
-               return func.apply(this, args);
-       },
-
-       assert: function(condition, message) {
-               if (!condition) {
-                       this.field.classList.add('cbi-input-invalid');
-                       this.error = message;
-                       return false;
-               }
-
-               this.field.classList.remove('cbi-input-invalid');
-               this.error = null;
-               return true;
-       },
-
-       compile: function(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 this.types[label] == 'function') {
-                                                       stack.push(this.types[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] = this.compile(code.substring(pos, i));
-                                       pos = i+1;
-                               }
-
-                               break;
-                       }
-               }
-
-               return stack;
-       },
-
-       validate: function() {
-               /* element is detached */
-               if (!this.field.form)
-                       return true;
-
-               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;
-
-               var valid;
-
-               if (this.value.length === 0)
-                       valid = this.assert(this.optional, _('non-empty value'));
-               else
-                       valid = this.vstack[0].apply(this, this.vstack[1]);
-
-               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 valid;
-       },
-
-       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;
-
-                       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)'));
-                       }
-
-                       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);
-                               }
-                       }
-
-                       return this.assert(false, _('one of:\n - %s'.format(errors.join('\n - '))));
-               },
-
-               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 this.assert(true);
-               },
-
-               neg: function() {
-                       return this.apply('or', this.value.replace(/^[ \t]*![ \t]*/, ''), arguments);
-               },
-
-               list: function(subvalidator, subargs) {
-                       this.field.setAttribute('data-is-list', 'true');
-
-                       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);
-
-                       return this.assert(true);
-               },
-
-               phonedigit: function() {
-                       return this.assert(this.value.match(/^[0-9\*#!\.]+$/),
-                               _('valid phone digit (0-9, "*", "#", "!" or ".")'));
-               },
-
-               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'));
-               },
-
-               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 ];
-
-                               function is_leap_year(year) {
-                                       return ((!(year % 4) && (year % 100)) || !(year % 400));
-                               }
-
-                               function get_days_in_month(month, year) {
-                                       return (month === 2 && is_leap_year(year)) ? 29 : days_in_month[month - 1];
-                               }
-
-                               /* 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)'));
-
-                       }
-
-                       return this.assert(false, _('valid date (YYYY-MM-DD)'));
-               },
-
-               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;
-
-                       section.querySelectorAll(query).forEach(function(sibling) {
-                               if (sibling === option)
-                                       return;
-
-                               var input = sibling.querySelector('[data-type]'),
-                                   values = input.getAttribute('data-is-list') ? input.value.match(/[^ \t]+/g) : [ input.value ];
-
-                               if (values !== null && values.indexOf(ctx.value) !== -1)
-                                       unique = false;
-                       });
-
-                       if (!unique)
-                               return this.assert(false, _('unique value'));
-
-                       if (typeof(subvalidator) === 'function')
-                               return this.apply(subvalidator, undefined, subargs);
-
-                       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;
@@ -689,18 +192,23 @@ function cbi_d_update() {
                        parent.parentNode.style.display = (parent.options.length <= 1) ? 'none' : '';
        }
 
-       if (entry && entry.parent) {
-               if (!cbi_t_update())
-                       cbi_tag_last(parent);
-       }
+       if (entry && entry.parent)
+               cbi_tag_last(parent);
 
        if (state)
                cbi_d_update();
+       else if (parent)
+               parent.dispatchEvent(new CustomEvent('dependency-update', { bubbles: true }));
 }
 
 function cbi_init() {
        var nodes;
 
+       document.querySelectorAll('.cbi-dropdown').forEach(function(node) {
+               cbi_dropdown_init(node);
+               node.addEventListener('cbi-dropdown-change', cbi_d_update);
+       });
+
        nodes = document.querySelectorAll('[data-strings]');
 
        for (var i = 0, node; (node = nodes[i]) !== undefined; i++) {
@@ -735,8 +243,8 @@ function cbi_init() {
        nodes = document.querySelectorAll('[data-choices]');
 
        for (var i = 0, node; (node = nodes[i]) !== undefined; i++) {
-               var choices = JSON.parse(node.getAttribute('data-choices'));
-               var options = {};
+               var choices = JSON.parse(node.getAttribute('data-choices')),
+                   options = {};
 
                for (var j = 0; j < choices[0].length; j++)
                        options[choices[0][j]] = choices[1][j];
@@ -744,15 +252,24 @@ function cbi_init() {
                var def = (node.getAttribute('data-optional') === 'true')
                        ? node.placeholder || '' : null;
 
-               cbi_combobox_init(node, options, def,
-                                 node.getAttribute('data-manual'));
+               var cb = new L.ui.Combobox(node.value, options, {
+                       name: node.getAttribute('name'),
+                       sort: choices[0],
+                       select_placeholder: def || _('-- Please choose --'),
+                       custom_placeholder: node.getAttribute('data-manual') || _('-- custom --')
+               });
+
+               var n = cb.render();
+               n.addEventListener('cbi-dropdown-change', cbi_d_update);
+               node.parentNode.replaceChild(n, node);
        }
 
        nodes = document.querySelectorAll('[data-dynlist]');
 
        for (var i = 0, node; (node = nodes[i]) !== undefined; i++) {
-               var choices = JSON.parse(node.getAttribute('data-dynlist'));
-               var options = null;
+               var choices = JSON.parse(node.getAttribute('data-dynlist')),
+                   values = JSON.parse(node.getAttribute('data-values') || '[]'),
+                   options = null;
 
                if (choices[0] && choices[0].length) {
                        options = {};
@@ -761,7 +278,17 @@ function cbi_init() {
                                options[choices[0][j]] = choices[1][j];
                }
 
-               cbi_dynlist_init(node, choices[2], choices[3], options);
+               var dl = new L.ui.DynamicList(values, options, {
+                       name: node.getAttribute('data-prefix'),
+                       sort: choices[0],
+                       datatype: choices[2],
+                       optional: choices[3],
+                       placeholder: node.getAttribute('data-placeholder')
+               });
+
+               var n = dl.render();
+               n.addEventListener('cbi-dynlist-change', cbi_d_update);
+               node.parentNode.replaceChild(n, node);
        }
 
        nodes = document.querySelectorAll('[data-type]');
@@ -771,10 +298,6 @@ function cbi_init() {
                                   node.getAttribute('data-type'));
        }
 
-       document.querySelectorAll('.cbi-dropdown').forEach(function(s) {
-               cbi_dropdown_init(s);
-       });
-
        document.querySelectorAll('.cbi-tooltip:not(:empty)').forEach(function(s) {
                s.parentNode.classList.add('cbi-tooltip-container');
        });
@@ -791,420 +314,22 @@ function cbi_init() {
                i.addEventListener('mouseout', handler);
        });
 
-       cbi_d_update();
-}
-
-function cbi_combobox(id, values, def, man, focus) {
-       var selid = "cbi.combobox." + id;
-       if (document.getElementById(selid)) {
-               return
-       }
-
-       var obj = document.getElementById(id)
-       var sel = document.createElement("select");
-               sel.id = selid;
-               sel.index = obj.index;
-               sel.classList.remove('cbi-input-text');
-               sel.classList.add('cbi-input-select');
-
-       if (obj.nextSibling)
-               obj.parentNode.insertBefore(sel, obj.nextSibling);
-       else
-               obj.parentNode.appendChild(sel);
-
-       var dt = obj.getAttribute('cbi_datatype');
-       var op = obj.getAttribute('cbi_optional');
-
-       if (!values[obj.value]) {
-               if (obj.value == "") {
-                       var optdef = document.createElement("option");
-                       optdef.value = "";
-                       optdef.appendChild(document.createTextNode(typeof(def) === 'string' ? def : _('-- Please choose --')));
-                       sel.appendChild(optdef);
-               }
-               else {
-                       var opt = document.createElement("option");
-                       opt.value = obj.value;
-                       opt.selected = "selected";
-                       opt.appendChild(document.createTextNode(obj.value));
-                       sel.appendChild(opt);
-               }
-       }
-
-       for (var i in values) {
-               var opt = document.createElement("option");
-               opt.value = i;
-
-               if (obj.value == i)
-                       opt.selected = "selected";
-
-               opt.appendChild(document.createTextNode(values[i]));
-               sel.appendChild(opt);
-       }
-
-       var optman = document.createElement("option");
-       optman.value = "";
-       optman.appendChild(document.createTextNode(typeof(man) === 'string' ? man : _('-- custom --')));
-       sel.appendChild(optman);
-
-       obj.style.display = "none";
-
-       if (dt)
-               cbi_validate_field(sel, op == 'true', dt);
-
-       sel.addEventListener("change", function() {
-               if (sel.selectedIndex == sel.options.length - 1) {
-                       obj.style.display = "inline";
-                       sel.blur();
-                       sel.parentNode.removeChild(sel);
-                       obj.focus();
-               }
-               else {
-                       obj.value = sel.options[sel.selectedIndex].value;
-               }
-
-               try {
-                       cbi_d_update();
-               } catch (e) {
-                       //Do nothing
-               }
-       })
+       var tasks = [];
 
-       // Retrigger validation in select
-       if (focus) {
-               sel.focus();
-               sel.blur();
-       }
-}
+       document.querySelectorAll('[data-ui-widget]').forEach(function(node) {
+               var args = JSON.parse(node.getAttribute('data-ui-widget') || '[]'),
+                   widget = new (Function.prototype.bind.apply(L.ui[args[0]], args)),
+                   markup = widget.render();
 
-function cbi_combobox_init(id, values, def, man) {
-       var obj = (typeof(id) === 'string') ? document.getElementById(id) : id;
-       obj.addEventListener("blur", function() {
-               cbi_combobox(obj.id, values, def, man, true);
+               tasks.push(Promise.resolve(markup).then(function(markup) {
+                       markup.addEventListener('widget-change', cbi_d_update);
+                       node.parentNode.replaceChild(markup, node);
+               }));
        });
-       cbi_combobox(obj.id, values, def, man, false);
-}
-
-function cbi_filebrowser(id, defpath) {
-       var field   = document.getElementById(id);
-       var browser = window.open(
-               cbi_strings.path.browser + ( field.value || defpath || '' ) + '?field=' + id,
-               "luci_filebrowser", "width=300,height=400,left=100,top=200,scrollbars=yes"
-       );
-
-       browser.focus();
-}
-
-function cbi_browser_init(id, resource, defpath)
-{
-       function cbi_browser_btnclick(e) {
-               cbi_filebrowser(id, defpath);
-               return false;
-       }
-
-       var field = document.getElementById(id);
 
-       var btn = document.createElement('img');
-       btn.className = 'cbi-image-button';
-       btn.src = (resource || cbi_strings.path.resource) + '/cbi/folder.gif';
-       field.parentNode.insertBefore(btn, field.nextSibling);
-
-       btn.addEventListener('click', cbi_browser_btnclick);
+       Promise.all(tasks).then(cbi_d_update);
 }
 
-function cbi_dynlist_init(parent, datatype, optional, choices)
-{
-       var prefix = parent.getAttribute('data-prefix');
-       var holder = parent.getAttribute('data-placeholder');
-
-       var values;
-
-       function cbi_dynlist_redraw(focus, add, del)
-       {
-               values = [ ];
-
-               while (parent.firstChild) {
-                       var n = parent.firstChild;
-                       var i = +n.index;
-
-                       if (i != del) {
-                               if (matchesElem(n, 'input'))
-                                       values.push(n.value || '');
-                               else if (matchesElem(n, 'select'))
-                                       values[values.length-1] = n.options[n.selectedIndex].value;
-                       }
-
-                       parent.removeChild(n);
-               }
-
-               if (add >= 0) {
-                       focus = add+1;
-                       values.splice(focus, 0, '');
-               }
-               else if (values.length == 0) {
-                       focus = 0;
-                       values.push('');
-               }
-
-               for (var i = 0; i < values.length; i++) {
-                       var t = document.createElement('input');
-                               t.id = prefix + '.' + (i+1);
-                               t.name = prefix;
-                               t.value = values[i];
-                               t.type = 'text';
-                               t.index = i;
-                               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')
-                       }, (i+1) < values.length ? '×' : '+');
-
-                       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, '', _('-- custom --'));
-                               b.index = i;
-
-                               b.addEventListener('keydown',  cbi_dynlist_keydown);
-                               b.addEventListener('keypress', cbi_dynlist_keypress);
-
-                               if (i == focus || -i == focus)
-                                       b.focus();
-                       }
-                       else {
-                               t.addEventListener('keydown',  cbi_dynlist_keydown);
-                               t.addEventListener('keypress', cbi_dynlist_keypress);
-
-                               if (i == focus) {
-                                       t.focus();
-                               }
-                               else if (-i == focus) {
-                                       t.focus();
-
-                                       /* force cursor to end */
-                                       var v = t.value;
-                                       t.value = ' '
-                                       t.value = v;
-                               }
-                       }
-
-                       b.addEventListener('click', cbi_dynlist_btnclick);
-               }
-       }
-
-       function cbi_dynlist_keypress(ev)
-       {
-               ev = ev ? ev : window.event;
-
-               var se = ev.target ? ev.target : ev.srcElement;
-
-               if (se.nodeType == 3)
-                       se = se.parentNode;
-
-               switch (ev.keyCode) {
-                       /* backspace, delete */
-                       case 8:
-                       case 46:
-                               if (se.value.length == 0) {
-                                       if (ev.preventDefault)
-                                               ev.preventDefault();
-
-                                       return false;
-                               }
-
-                               return true;
-
-                       /* enter, arrow up, arrow down */
-                       case 13:
-                       case 38:
-                       case 40:
-                               if (ev.preventDefault)
-                                       ev.preventDefault();
-
-                               return false;
-               }
-
-               return true;
-       }
-
-       function cbi_dynlist_keydown(ev)
-       {
-               ev = ev ? ev : window.event;
-
-               var se = ev.target ? ev.target : ev.srcElement;
-
-               if (se.nodeType == 3)
-                       se = se.parentNode;
-
-               var prev = se.previousSibling;
-               while (prev && prev.name != prefix)
-                       prev = prev.previousSibling;
-
-               var next = se.nextSibling;
-               while (next && next.name != prefix)
-                       next = next.nextSibling;
-
-               /* advance one further in combobox case */
-               if (next && next.nextSibling.name == prefix)
-                       next = next.nextSibling;
-
-               switch (ev.keyCode) {
-                       /* backspace, delete */
-                       case 8:
-                       case 46:
-                               var del = (matchesElem(se, 'select'))
-                                       ? true : (se.value.length == 0);
-
-                               if (del) {
-                                       if (ev.preventDefault)
-                                               ev.preventDefault();
-
-                                       var focus = se.index;
-                                       if (ev.keyCode == 8)
-                                               focus = -focus+1;
-
-                                       cbi_dynlist_redraw(focus, -1, se.index);
-
-                                       return false;
-                               }
-
-                               break;
-
-                       /* enter */
-                       case 13:
-                               cbi_dynlist_redraw(-1, se.index, -1);
-                               break;
-
-                       /* arrow up */
-                       case 38:
-                               if (prev)
-                                       prev.focus();
-
-                               break;
-
-                       /* arrow down */
-                       case 40:
-                               if (next)
-                                       next.focus();
-
-                               break;
-               }
-
-               return true;
-       }
-
-       function cbi_dynlist_btnclick(ev)
-       {
-               ev = ev ? ev : window.event;
-
-               var se = ev.target ? ev.target : ev.srcElement;
-               var input = se.previousSibling;
-               while (input && input.name != prefix)
-                       input = input.previousSibling;
-
-               if (se.classList.contains('cbi-button-remove')) {
-                       input.value = '';
-
-                       cbi_dynlist_keydown({
-                               target:  input,
-                               keyCode: 8
-                       });
-               }
-               else {
-                       cbi_dynlist_keydown({
-                               target:  input,
-                               keyCode: 13
-                       });
-               }
-
-               return false;
-       }
-
-       cbi_dynlist_redraw(NaN, -1, -1);
-}
-
-
-function cbi_t_add(section, tab) {
-       var t = document.getElementById('tab.' + section + '.' + tab);
-       var c = document.getElementById('container.' + section + '.' + tab);
-
-       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]) {
-               var o = cbi_t[section][tab];
-               var h = document.getElementById('tab.' + section);
-
-               for (var tid in cbi_t[section]) {
-                       var o2 = cbi_t[section][tid];
-
-                       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.classList.remove('cbi-tab-disabled');
-                               o2.tab.classList.add('cbi-tab');
-                               o2.container.style.display = 'block';
-                       }
-               }
-       }
-
-       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]) {
-                       var t = cbi_t[sid][tid].tab;
-                       var c = cbi_t[sid][tid].container;
-
-                       if (!c.firstElementChild) {
-                               t.style.display = 'none';
-                       }
-                       else if (t.style.display == 'none') {
-                               t.style.display = '';
-                               t.classList.add('cbi-tab-highlighted');
-                               hl_tabs.push(t);
-                       }
-
-                       cbi_tag_last(c);
-                       updated = true;
-               }
-
-       if (hl_tabs.length > 0)
-               window.setTimeout(function() {
-                       for (var i = 0; i < hl_tabs.length; i++)
-                               hl_tabs[i].classList.remove('cbi-tab-highlighted');
-               }, 750);
-
-       return updated;
-}
-
-
 function cbi_validate_form(form, errmsg)
 {
        /* if triggered by a section removal or addition, don't validate */
@@ -1240,39 +365,31 @@ function cbi_validate_field(cbid, optional, type)
        var validatorFn;
 
        try {
-               var cbiValidator = new CBIValidator(field, type, optional);
-
-               validatorFn = function() {
-                       return cbiValidator.validate();
-               };
+               var cbiValidator = L.validation.create(field, type, optional);
+               validatorFn = cbiValidator.validate.bind(cbiValidator);
        }
        catch(e) {
                validatorFn = null;
        };
 
        if (validatorFn !== null) {
-               if (!field.form.cbi_validators)
-                       field.form.cbi_validators = [ ];
+               var form = findParent(field, 'form');
 
-               field.form.cbi_validators.push(validatorFn);
+               if (!form.cbi_validators)
+                       form.cbi_validators = [ ];
+
+               form.cbi_validators.push(validatorFn);
 
                field.addEventListener("blur",  validatorFn);
                field.addEventListener("keyup", validatorFn);
+               field.addEventListener("cbi-dropdown-change", validatorFn);
 
                if (matchesElem(field, 'select')) {
                        field.addEventListener("change", validatorFn);
                        field.addEventListener("click",  validatorFn);
                }
 
-               field.setAttribute("cbi_validate", validatorFn);
-               field.setAttribute("cbi_datatype", type);
-               field.setAttribute("cbi_optional", (!!optional).toString());
-
                validatorFn();
-
-               var fcbox = document.getElementById('cbi.combobox.' + field.id);
-               if (fcbox)
-                       cbi_validate_field(fcbox, optional, type);
        }
 }
 
@@ -1428,7 +545,7 @@ String.prototype.format = function()
 
                                switch(pType) {
                                        case 'b':
-                                               subst = (+param || 0).toString(2);
+                                               subst = Math.floor(+param || 0).toString(2);
                                                break;
 
                                        case 'c':
@@ -1436,11 +553,12 @@ String.prototype.format = function()
                                                break;
 
                                        case 'd':
-                                               subst = ~~(+param || 0);
+                                               subst = Math.floor(+param || 0).toFixed(0);
                                                break;
 
                                        case 'u':
-                                               subst = ~~Math.abs(+param || 0);
+                                               var n = +param || 0;
+                                               subst = Math.floor((n < 0) ? 0x100000000 + n : n).toFixed(0);
                                                break;
 
                                        case 'f':
@@ -1450,7 +568,7 @@ String.prototype.format = function()
                                                break;
 
                                        case 'o':
-                                               subst = (+param || 0).toString(8);
+                                               subst = Math.floor(+param || 0).toString(8);
                                                break;
 
                                        case 's':
@@ -1458,11 +576,11 @@ String.prototype.format = function()
                                                break;
 
                                        case 'x':
-                                               subst = ('' + (+param || 0).toString(16)).toLowerCase();
+                                               subst = Math.floor(+param || 0).toString(16).toLowerCase();
                                                break;
 
                                        case 'X':
-                                               subst = ('' + (+param || 0).toString(16)).toUpperCase();
+                                               subst = Math.floor(+param || 0).toString(16).toUpperCase();
                                                break;
 
                                        case 'h':
@@ -1568,97 +686,20 @@ if (window.NodeList && !NodeList.prototype.forEach) {
        };
 }
 
-
-var dummyElem, domParser;
-
-function isElem(e)
-{
-       return (typeof(e) === 'object' && e !== null && 'nodeType' in e);
-}
-
-function toElem(s)
-{
-       var elem;
-
-       try {
-               domParser = domParser || new DOMParser();
-               elem = domParser.parseFromString(s, 'text/html').body.firstChild;
-       }
-       catch(e) {}
-
-       if (!elem) {
-               try {
-                       dummyElem = dummyElem || document.createElement('div');
-                       dummyElem.innerHTML = s;
-                       elem = dummyElem.firstChild;
-               }
-               catch (e) {}
-       }
-
-       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 (matchesElem(node, selector))
-                       return node;
-               else
-                       node = node.parentNode;
-
-       return null;
+if (!window.requestAnimationFrame) {
+       window.requestAnimationFrame = function(f) {
+               window.setTimeout(function() {
+                       f(new Date().getTime())
+               }, 1000/30);
+       };
 }
 
-function E()
-{
-       var html = arguments[0],
-           attr = (arguments[1] instanceof Object && !Array.isArray(arguments[1])) ? arguments[1] : null,
-           data = attr ? arguments[2] : arguments[1],
-           elem;
-
-       if (isElem(html))
-               elem = html;
-       else if (html.charCodeAt(0) === 60)
-               elem = toElem(html);
-       else
-               elem = document.createElement(html);
-
-       if (!elem)
-               return null;
-
-       if (attr)
-               for (var key in attr)
-                       if (attr.hasOwnProperty(key) && attr[key] !== null && attr[key] !== undefined)
-                               elem.setAttribute(key, attr[key]);
-
-       if (typeof(data) === 'function')
-               data = data(elem);
-
-       if (isElem(data)) {
-               elem.appendChild(data);
-       }
-       else if (Array.isArray(data)) {
-               for (var i = 0; i < data.length; i++)
-                       if (isElem(data[i]))
-                               elem.appendChild(data[i]);
-                       else
-                               elem.appendChild(document.createTextNode('' + data[i]));
-       }
-       else if (data !== null && data !== undefined) {
-               elem.innerHTML = '' + data;
-       }
 
-       return elem;
-}
+function isElem(e) { return L.dom.elem(e) }
+function toElem(s) { return L.dom.parse(s) }
+function matchesElem(node, selector) { return L.dom.matches(node, selector) }
+function findParent(node, selector) { return L.dom.parent(node, selector) }
+function E() { return L.dom.create.apply(L.dom, arguments) }
 
 if (typeof(window.CustomEvent) !== 'function') {
        function CustomEvent(event, params) {
@@ -1672,467 +713,11 @@ if (typeof(window.CustomEvent) !== 'function') {
        window.CustomEvent = CustomEvent;
 }
 
-CBIDropdown = {
-       openDropdown: function(sb) {
-               var st = window.getComputedStyle(sb, null),
-                   ul = sb.querySelector('ul'),
-                   li = ul.querySelectorAll('li'),
-                   sel = ul.querySelector('[selected]'),
-                   rect = sb.getBoundingClientRect(),
-                   h = sb.clientHeight - parseFloat(st.paddingTop) - parseFloat(st.paddingBottom),
-                   mh = this.dropdown_items * h,
-                   eh = Math.min(mh, li.length * h);
-
-               document.querySelectorAll('.cbi-dropdown[open]').forEach(function(s) {
-                       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;
-               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);
-                   pv.classList.remove('dropdown');
-                   pv.classList.add('preview');
-
-               sb.insertBefore(pv, ul.nextElementSibling);
-
-               li.forEach(function(l) {
-                       l.setAttribute('tabindex', 0);
-               });
-
-               sb.lastElementChild.setAttribute('tabindex', 0);
-
-               this.setFocus(sb, sel || li[0], true);
-       },
-
-       closeDropdown: function(sb, no_focus) {
-               if (!sb.hasAttribute('open'))
-                       return;
-
-               var pv = sb.querySelector('ul.preview'),
-                   ul = sb.querySelector('ul.dropdown'),
-                   li = ul.querySelectorAll('li');
-
-               li.forEach(function(l) { l.removeAttribute('tabindex'); });
-               sb.lastElementChild.removeAttribute('tabindex');
-
-               sb.removeChild(pv);
-               sb.removeAttribute('open');
-               sb.style.width = sb.style.height = '';
-
-               ul.classList.remove('dropdown');
-
-               if (!no_focus)
-                       this.setFocus(sb, sb);
-
-               this.saveValues(sb, ul);
-       },
-
-       toggleItem: function(sb, li, force_state) {
-               if (li.hasAttribute('unselectable'))
-                       return;
-
-               if (this.multi) {
-                       var cbox = li.querySelector('input[type="checkbox"]'),
-                           items = li.parentNode.querySelectorAll('li'),
-                           label = sb.querySelector('ul.preview'),
-                           sel = li.parentNode.querySelectorAll('[selected]').length,
-                           more = sb.querySelector('.more'),
-                           ndisplay = this.display_items,
-                           n = 0;
-
-                       if (li.hasAttribute('selected')) {
-                               if (force_state !== true) {
-                                       if (sel > 1 || this.optional) {
-                                               li.removeAttribute('selected');
-                                               cbox.checked = cbox.disabled = false;
-                                               sel--;
-                                       }
-                                       else {
-                                               cbox.disabled = true;
-                                       }
-                               }
-                       }
-                       else {
-                               if (force_state !== false) {
-                                       li.setAttribute('selected', '');
-                                       cbox.checked = true;
-                                       cbox.disabled = false;
-                                       sel++;
-                               }
-                       }
-
-                       while (label.firstElementChild)
-                               label.removeChild(label.firstElementChild);
-
-                       for (var i = 0; i < items.length; i++) {
-                               items[i].removeAttribute('display');
-                               if (items[i].hasAttribute('selected')) {
-                                       if (ndisplay-- > 0) {
-                                               items[i].setAttribute('display', n++);
-                                               label.appendChild(items[i].cloneNode(true));
-                                       }
-                                       var c = items[i].querySelector('input[type="checkbox"]');
-                                       if (c)
-                                               c.disabled = (sel == 1 && !this.optional);
-                               }
-                       }
-
-                       if (ndisplay < 0)
-                               sb.setAttribute('more', '');
-                       else
-                               sb.removeAttribute('more');
-
-                       if (ndisplay === this.display_items)
-                               sb.setAttribute('empty', '');
-                       else
-                               sb.removeAttribute('empty');
-
-                       more.innerHTML = (ndisplay === this.display_items) ? this.placeholder : '···';
-               }
-               else {
-                       var sel = li.parentNode.querySelector('[selected]');
-                       if (sel) {
-                               sel.removeAttribute('display');
-                               sel.removeAttribute('selected');
-                       }
-
-                       li.setAttribute('display', 0);
-                       li.setAttribute('selected', '');
-
-                       this.closeDropdown(sb, true);
-               }
-
-               this.saveValues(sb, li.parentNode);
-       },
-
-       transformItem: function(sb, li) {
-               var cbox = E('form', {}, E('input', { type: 'checkbox', tabindex: -1, onclick: 'event.preventDefault()' })),
-                   label = E('label');
-
-               while (li.firstChild)
-                       label.appendChild(li.firstChild);
-
-               li.appendChild(cbox);
-               li.appendChild(label);
-       },
-
-       saveValues: function(sb, ul) {
-               var sel = ul.querySelectorAll('[selected]'),
-                   div = sb.lastElementChild;
-
-               while (div.lastElementChild)
-                       div.removeChild(div.lastElementChild);
-
-               sel.forEach(function (s) {
-                       div.appendChild(E('input', {
-                               type: 'hidden',
-                               name: s.hasAttribute('name') ? s.getAttribute('name') : (sb.getAttribute('name') || ''),
-                               value: s.hasAttribute('data-value') ? s.getAttribute('data-value') : s.innerText
-                       }));
-               });
-
-               cbi_d_update();
-       },
-
-       setFocus: function(sb, elem, scroll) {
-               if (sb && sb.hasAttribute && sb.hasAttribute('locked-in'))
-                       return;
-
-               document.querySelectorAll('.focus').forEach(function(e) {
-                       if (!matchesElem(e, 'input')) {
-                               e.classList.remove('focus');
-                               e.blur();
-                       }
-               });
-
-               if (elem) {
-                       elem.focus();
-                       elem.classList.add('focus');
-
-                       if (scroll)
-                               elem.parentNode.scrollTop = elem.offsetTop - elem.parentNode.offsetTop;
-               }
-       },
-
-       createItems: function(sb, value) {
-               var sbox = this,
-                   val = (value || '').trim().split(/\s+/),
-                   ul = sb.querySelector('ul');
-
-               if (!sbox.multi)
-                       val.length = Math.min(val.length, 1);
-
-               val.forEach(function(item) {
-                       var new_item = null;
-
-                       ul.childNodes.forEach(function(li) {
-                               if (li.getAttribute && li.getAttribute('data-value') === item)
-                                       new_item = li;
-                       });
-
-                       if (!new_item) {
-                               var markup,
-                                   tpl = sb.querySelector(sbox.template);
-
-                               if (tpl)
-                                       markup = (tpl.textContent || tpl.innerHTML || tpl.firstChild.data).replace(/^<!--|-->$/, '').trim();
-                               else
-                                       markup = '<li data-value="{{value}}">{{value}}</li>';
-
-                               new_item = E(markup.replace(/{{value}}/g, item));
-
-                               if (sbox.multi) {
-                                       sbox.transformItem(sb, new_item);
-                               }
-                               else {
-                                       var old = ul.querySelector('li[created]');
-                                       if (old)
-                                               ul.removeChild(old);
-
-                                       new_item.setAttribute('created', '');
-                               }
-
-                               new_item = ul.insertBefore(new_item, ul.lastElementChild);
-                       }
-
-                       sbox.toggleItem(sb, new_item, true);
-                       sbox.setFocus(sb, new_item, true);
-               });
-       },
-
-       closeAllDropdowns: function() {
-               document.querySelectorAll('.cbi-dropdown[open]').forEach(function(s) {
-                       s.dispatchEvent(new CustomEvent('cbi-dropdown-close', {}));
-               });
-       }
-};
-
 function cbi_dropdown_init(sb) {
-       if (!(this instanceof cbi_dropdown_init))
-               return new cbi_dropdown_init(sb);
-
-       this.multi = sb.hasAttribute('multiple');
-       this.optional = sb.hasAttribute('optional');
-       this.placeholder = sb.getAttribute('placeholder') || '---';
-       this.display_items = parseInt(sb.getAttribute('display-items') || 3);
-       this.dropdown_items = parseInt(sb.getAttribute('dropdown-items') || 5);
-       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'),
-           more = sb.appendChild(E('span', { class: 'more', tabindex: -1 }, '···')),
-           open = sb.appendChild(E('span', { class: 'open', tabindex: -1 }, '▾')),
-           canary = sb.appendChild(E('div')),
-           create = sb.querySelector(this.create),
-           ndisplay = this.display_items,
-           n = 0;
-
-       if (this.multi) {
-               for (var i = 0; i < items.length; i++) {
-                       sbox.transformItem(sb, items[i]);
-
-                       if (items[i].hasAttribute('selected') && ndisplay-- > 0)
-                               items[i].setAttribute('display', n++);
-               }
-       }
-       else {
-               var sel = sb.querySelectorAll('[selected]');
-
-               sel.forEach(function(s) {
-                       s.removeAttribute('selected');
-               });
-
-               var s = sel[0] || items[0];
-               if (s) {
-                       s.setAttribute('selected', '');
-                       s.setAttribute('display', n++);
-               }
-
-               ndisplay--;
-
-               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);
-               }
-       }
-
-       sbox.saveValues(sb, ul);
-
-       ul.setAttribute('tabindex', -1);
-       sb.setAttribute('tabindex', 0);
-
-       if (ndisplay < 0)
-               sb.setAttribute('more', '')
-       else
-               sb.removeAttribute('more');
-
-       if (ndisplay === this.display_items)
-               sb.setAttribute('empty', '')
-       else
-               sb.removeAttribute('empty');
-
-       more.innerHTML = (ndisplay === this.display_items) ? this.placeholder : '···';
-
-
-       sb.addEventListener('click', function(ev) {
-               if (!this.hasAttribute('open')) {
-                       if (!matchesElem(ev.target, '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 (matchesElem(ev.target, '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);
-       });
-
-       if ('ontouchstart' in window) {
-               sb.addEventListener('touchstart', function(ev) { ev.stopPropagation(); });
-               window.addEventListener('touchstart', sbox.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', {}));
-                       });
-               });
-
-               canary.addEventListener('focus', function(ev) {
-                       sbox.closeDropdown(this.parentNode);
-               });
-
-               window.addEventListener('mouseover', sbox.setFocus);
-               window.addEventListener('click', sbox.closeAllDropdowns);
-       }
-
-       if (create) {
-               create.addEventListener('keydown', function(ev) {
-                       switch (ev.keyCode) {
-                       case 13:
-                               ev.preventDefault();
-
-                               if (this.classList.contains('cbi-input-invalid'))
-                                       return;
-
-                               sbox.createItems(sb, this.value);
-                               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');
-               });
-
-               var li = findParent(create, 'li');
-
-               li.setAttribute('unselectable', '');
-               li.addEventListener('click', function(ev) {
-                       this.querySelector(sbox.create).focus();
-               });
-       }
+       var dl = new L.ui.Dropdown(sb, null, { name: sb.getAttribute('name') });
+       return dl.bind(sb);
 }
 
-cbi_dropdown_init.prototype = CBIDropdown;
-
 function cbi_update_table(table, data, placeholder) {
        var target = isElem(table) ? table : document.querySelector(table);
 
@@ -2203,67 +788,26 @@ 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 showModal(title, children)
+{
+       return L.showModal(title, children);
 }
 
-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);
+function hideModal()
+{
+       return L.hideModal();
 }
 
-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('DOMContentLoaded', function() {
        document.addEventListener('validation-failure', function(ev) {
                if (ev.target === document.activeElement)
-                       showTooltip(ev);
+                       L.showTooltip(ev);
        });
 
        document.addEventListener('validation-success', function(ev) {
                if (ev.target === document.activeElement)
-                       hideTooltip(ev);
+                       L.hideTooltip(ev);
        });
 
        document.querySelectorAll('.table').forEach(cbi_update_table);