luci-mod-network: steering flow - permit only integer value
[project/luci.git] / modules / luci-base / htdocs / luci-static / resources / cbi.js
index 1c5e4133ad232347534d611293fce078793d5446..d7b462c367e54106c58a4f48af5e016095210ea7 100644 (file)
@@ -94,563 +94,27 @@ function sfh(s) {
        return (0x100000000 + hash).toString(16).substr(1);
 }
 
-function _(s) {
-       return (window.TR && TR[sfh(s)]) || s;
-}
+var plural_function = null;
 
-function Int(x) {
-       return (/^-?\d+$/.test(x) ? +x : NaN);
+function trimws(s) {
+       return String(s).trim().replace(/[ \t\n]+/g, ' ');
 }
 
-function Dec(x) {
-       return (/^-?\d+(?:\.\d+)?$/.test(x) ? +x : NaN);
+function _(s, c) {
+       var k = (c != null ? trimws(c) + '\u0001' : '') + trimws(s);
+       return (window.TR && TR[sfh(k)]) || s;
 }
 
-function IPv4(x) {
-       if (!x.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/))
-               return null;
+function N_(n, s, p, c) {
+       if (plural_function == null && window.TR)
+               plural_function = new Function('n', (TR['00000000'] || 'plural=(n != 1);') + 'return +plural');
 
-       if (RegExp.$1 > 255 || RegExp.$2 > 255 || RegExp.$3 > 255 || RegExp.$4 > 255)
-               return null;
+       var i = plural_function ? plural_function(n) : (n != 1),
+           k = (c != null ? trimws(c) + '\u0001' : '') + trimws(s) + '\u0002' + i.toString();
 
-       return [ +RegExp.$1, +RegExp.$2, +RegExp.$3, +RegExp.$4 ];
+       return (window.TR && TR[sfh(k)]) || (i ? p : s);
 }
 
-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 (!findParent(this.field, 'body') && !findParent(this.field, '[data-field]'))
-                       return true;
-
-               this.field.classList.remove('cbi-input-invalid');
-               this.value = (this.field.value != null) ? 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 !== true) {
-                       this.field.setAttribute('data-tooltip', _('Expecting %s').format(this.error));
-                       this.field.setAttribute('data-tooltip-style', 'error');
-                       this.field.dispatchEvent(new CustomEvent('validation-failure', { bubbles: true }));
-                       return false;
-               }
-
-               if (typeof(this.vfunc) == 'function')
-                       valid = this.vfunc(this.value);
-
-               if (valid !== true) {
-                       this.assert(false, valid);
-                       this.field.setAttribute('data-tooltip', valid);
-                       this.field.setAttribute('data-tooltip-style', 'error');
-                       this.field.dispatchEvent(new CustomEvent('validation-failure', { bubbles: true }));
-                       return false;
-               }
-
-               this.field.removeAttribute('data-tooltip');
-               this.field.removeAttribute('data-tooltip-style');
-               this.field.dispatchEvent(new CustomEvent('validation-success', { bubbles: true }));
-               return true;
-       },
-
-       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[1], [true]) && this.apply('port', m4[2]),
-                                       _('valid address:port'));
-
-                       return this.assert(m6 && this.apply('ip6addr', m6[1], [true]) && this.apply('port', m6[2]),
-                               _('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 values = L.dom.callClassMethod(sibling.querySelector('[data-idref]'), 'getValue');
-
-                               if (!Array.isArray(values) && sibling.querySelector('[data-is-list]'))
-                                       values = String(values || '').match(/[^ \t]+/g) || [];
-                               else if (!Array.isArray(values))
-                                       values = (values != null) ? [ values ] : [];
-
-                               if (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);
-               },
-
-               hexstring: function() {
-                       return this.assert(this.value.match(/^([a-f0-9][a-f0-9]|[A-F0-9][A-F0-9])+$/),
-                               _('hexadecimal encoded value'));
-               },
-
-               string: function() {
-                       return true;
-               }
-       }
-};
-
-function CBIValidator(field, type, optional, vfunc)
-{
-       this.field = field;
-       this.optional = optional;
-       this.vfunc = vfunc;
-       this.vstack = this.compile(type);
-}
-
-CBIValidator.prototype = CBIValidatorPrototype;
-
 
 function cbi_d_add(field, dep, index) {
        var obj = (typeof(field) === 'string') ? document.getElementById(field) : field;
@@ -851,8 +315,6 @@ function cbi_init() {
                                   node.getAttribute('data-type'));
        }
 
-       document.querySelectorAll('[data-browser]').forEach(cbi_browser_init);
-
        document.querySelectorAll('.cbi-tooltip:not(:empty)').forEach(function(s) {
                s.parentNode.classList.add('cbi-tooltip-container');
        });
@@ -869,39 +331,20 @@ function cbi_init() {
                i.addEventListener('mouseout', handler);
        });
 
+       var tasks = [];
+
        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();
 
-               markup.addEventListener('widget-change', cbi_d_update);
-               node.parentNode.replaceChild(markup, node);
+               tasks.push(Promise.resolve(markup).then(function(markup) {
+                       markup.addEventListener('widget-change', cbi_d_update);
+                       node.parentNode.replaceChild(markup, node);
+               }));
        });
 
-       cbi_d_update();
-}
-
-function cbi_filebrowser(id, defpath) {
-       var field   = L.dom.elem(id) ? id : document.getElementById(id);
-       var browser = window.open(
-               cbi_strings.path.browser + (field.value || defpath || '') + '?field=' + field.id,
-               "luci_filebrowser", "width=300,height=400,left=100,top=200,scrollbars=yes"
-       );
-
-       browser.focus();
-}
-
-function cbi_browser_init(field)
-{
-       field.parentNode.insertBefore(
-               E('img', {
-                       'src': L.resource('cbi/folder.gif'),
-                       'class': 'cbi-image-button',
-                       'click': function(ev) {
-                               cbi_filebrowser(field, field.getAttribute('data-browser'));
-                               ev.preventDefault();
-                       }
-               }), field.nextSibling);
+       Promise.all(tasks).then(cbi_d_update);
 }
 
 function cbi_validate_form(form, errmsg)
@@ -924,6 +367,12 @@ function cbi_validate_form(form, errmsg)
        return true;
 }
 
+function cbi_validate_named_section_add(input)
+{
+       var button = input.parentNode.parentNode.querySelector('.cbi-button-add');
+       button.disabled = input.value === '';
+}
+
 function cbi_validate_reset(form)
 {
        window.setTimeout(
@@ -939,7 +388,7 @@ function cbi_validate_field(cbid, optional, type)
        var validatorFn;
 
        try {
-               var cbiValidator = new CBIValidator(field, type, optional);
+               var cbiValidator = L.validation.create(field, type, optional);
                validatorFn = cbiValidator.validate.bind(cbiValidator);
        }
        catch(e) {
@@ -1067,9 +516,14 @@ String.prototype.format = function()
        var quot_esc = [/"/g, '&#34;', /'/g, '&#39;'];
 
        function esc(s, r) {
-               if (typeof(s) !== 'string' && !(s instanceof String))
+               var t = typeof(s);
+
+               if (s == null || t === 'object' || t === 'function')
                        return '';
 
+               if (t !== 'string')
+                       s = String(s);
+
                for (var i = 0; i < r.length; i += 2)
                        s = s.replace(r[i], r[i+1]);
 
@@ -1119,7 +573,7 @@ String.prototype.format = function()
 
                                switch(pType) {
                                        case 'b':
-                                               subst = (+param || 0).toString(2);
+                                               subst = Math.floor(+param || 0).toString(2);
                                                break;
 
                                        case 'c':
@@ -1127,11 +581,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':
@@ -1141,7 +596,7 @@ String.prototype.format = function()
                                                break;
 
                                        case 'o':
-                                               subst = (+param || 0).toString(8);
+                                               subst = Math.floor(+param || 0).toString(8);
                                                break;
 
                                        case 's':
@@ -1149,11 +604,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':
@@ -1170,17 +625,17 @@ String.prototype.format = function()
                                                var tm = 0;
                                                var ts = (param || 0);
 
-                                               if (ts > 60) {
+                                               if (ts > 59) {
                                                        tm = Math.floor(ts / 60);
                                                        ts = (ts % 60);
                                                }
 
-                                               if (tm > 60) {
+                                               if (tm > 59) {
                                                        th = Math.floor(tm / 60);
                                                        tm = (tm % 60);
                                                }
 
-                                               if (th > 24) {
+                                               if (th > 23) {
                                                        td = Math.floor(th / 24);
                                                        th = (th % 24);
                                                }
@@ -1202,7 +657,11 @@ String.prototype.format = function()
                                                for (i = 0; (i < units.length) && (val > mf); i++)
                                                        val /= mf;
 
-                                               subst = (i ? val.toFixed(pr) : val) + units[i];
+                                               if (i)
+                                                       subst = val.toFixed(pr) + units[i] + (mf == 1024 ? 'i' : '');
+                                               else
+                                                       subst = val + ' ';
+
                                                pMinLength = null;
                                                break;
                                }
@@ -1274,19 +733,10 @@ 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) {
-               params = params || { bubbles: false, cancelable: false, detail: undefined };
-               var evt = document.createEvent('CustomEvent');
-                   evt.initCustomEvent( event, params.bubbles, params.cancelable, params.detail );
-               return evt;
-       }
-
-       CustomEvent.prototype = window.Event.prototype;
-       window.CustomEvent = CustomEvent;
-}
-
 function cbi_dropdown_init(sb) {
+       if (sb && L.dom.findClassInstance(sb) instanceof L.ui.Dropdown)
+               return;
+
        var dl = new L.ui.Dropdown(sb, null, { name: sb.getAttribute('name') });
        return dl.bind(sb);
 }
@@ -1297,68 +747,14 @@ function cbi_update_table(table, data, placeholder) {
        if (!isElem(target))
                return;
 
-       target.querySelectorAll('.tr.table-titles, .cbi-section-table-titles').forEach(function(thead) {
-               var titles = [];
-
-               thead.querySelectorAll('.th').forEach(function(th) {
-                       titles.push(th);
-               });
-
-               if (Array.isArray(data)) {
-                       var n = 0, rows = target.querySelectorAll('.tr');
-
-                       data.forEach(function(row) {
-                               var trow = E('div', { 'class': 'tr' });
-
-                               for (var i = 0; i < titles.length; i++) {
-                                       var text = (titles[i].innerText || '').trim();
-                                       var td = trow.appendChild(E('div', {
-                                               'class': titles[i].className,
-                                               'data-title': (text !== '') ? text : null
-                                       }, row[i] || ''));
-
-                                       td.classList.remove('th');
-                                       td.classList.add('td');
-                               }
-
-                               trow.classList.add('cbi-rowstyle-%d'.format((n++ % 2) ? 2 : 1));
-
-                               if (rows[n])
-                                       target.replaceChild(trow, rows[n]);
-                               else
-                                       target.appendChild(trow);
-                       });
-
-                       while (rows[++n])
-                               target.removeChild(rows[n]);
-
-                       if (placeholder && target.firstElementChild === target.lastElementChild) {
-                               var trow = target.appendChild(E('div', { 'class': 'tr placeholder' }));
-                               var td = trow.appendChild(E('div', { 'class': titles[0].className }, placeholder));
+       var t = L.dom.findClassInstance(target);
 
-                               td.classList.remove('th');
-                               td.classList.add('td');
-                       }
-               }
-               else {
-                       thead.parentNode.style.display = 'none';
-
-                       thead.parentNode.querySelectorAll('.tr, .cbi-section-table-row').forEach(function(trow) {
-                               if (trow !== thead) {
-                                       var n = 0;
-                                       trow.querySelectorAll('.th, .td').forEach(function(td) {
-                                               if (n < titles.length) {
-                                                       var text = (titles[n++].innerText || '').trim();
-                                                       if (text !== '')
-                                                               td.setAttribute('data-title', text);
-                                               }
-                                       });
-                               }
-                       });
+       if (!(t instanceof L.ui.Table)) {
+               t = new L.ui.Table(target);
+               L.dom.bindClassInstance(target, t);
+       }
 
-                       thead.parentNode.style.display = '';
-               }
-       });
+       t.update(data, placeholder);
 }
 
 function showModal(title, children)
@@ -1383,5 +779,7 @@ document.addEventListener('DOMContentLoaded', function() {
                        L.hideTooltip(ev);
        });
 
-       document.querySelectorAll('.table').forEach(cbi_update_table);
+       L.require('ui').then(function(ui) {
+               document.querySelectorAll('.table').forEach(cbi_update_table);
+       });
 });