libs/web: fix undesired autofocus of DynamicList widget
[project/luci.git] / libs / web / htdocs / luci-static / resources / cbi.js
index 0022149..7e387e7 100644 (file)
@@ -2,7 +2,7 @@
        LuCI - Lua Configuration Interface
 
        Copyright 2008 Steven Barth <steven@midlink.org>
-       Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
+       Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -42,21 +42,33 @@ var cbi_validators = {
                return cbi_validators.ip4addr(v) || cbi_validators.ip6addr(v);
        },
 
+       'neg_ipaddr': function(v)
+       {
+               return cbi_validators.ip4addr(v.replace(/^\s*!/, "")) || cbi_validators.ip6addr(v.replace(/^\s*!/, ""));
+       },
+
        'ip4addr': function(v)
        {
-               if( v.match(/^(\d+)\.(\d+)\.(\d+)\.(\d+)(\/(\d+))?$/) )
+               if (v.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(\/(\S+))?$/))
                {
                        return (RegExp.$1 >= 0) && (RegExp.$1 <= 255) &&
                               (RegExp.$2 >= 0) && (RegExp.$2 <= 255) &&
                               (RegExp.$3 >= 0) && (RegExp.$3 <= 255) &&
                               (RegExp.$4 >= 0) && (RegExp.$4 <= 255) &&
-                              (!RegExp.$5 || ((RegExp.$6 >= 0) && (RegExp.$6 <= 32)))
+                              ((RegExp.$6.indexOf('.') < 0)
+                                 ? ((RegExp.$6 >= 0) && (RegExp.$6 <= 32))
+                                 : (cbi_validators.ip4addr(RegExp.$6)))
                        ;
                }
 
                return false;
        },
 
+       'neg_ip4addr': function(v)
+       {
+               return cbi_validators.ip4addr(v.replace(/^\s*!/, ""));
+       },
+
        'ip6addr': function(v)
        {
                if( v.match(/^([a-fA-F0-9:.]+)(\/(\d+))?$/) )
@@ -142,7 +154,17 @@ var cbi_validators = {
 
        'hostname': function(v)
        {
-               return (v.match(/^[a-zA-Z_][a-zA-Z0-9_\-.]*$/) != null);
+               if (v.length <= 253)
+                       return (v.match(/^[a-zA-Z]+$/) != null ||
+                               (v.match(/^[a-zA-Z0-9][a-zA-Z0-9\-.]*[a-zA-Z0-9]$/) &&
+                                v.match(/[^0-9.]/)));
+
+               return false;
+       },
+
+       'network': function(v)
+       {
+               return cbi_validators.uciname(v) || cbi_validators.host(v);
        },
 
        'wpakey': function(v)
@@ -169,6 +191,12 @@ var cbi_validators = {
                return (v.match(/^[a-zA-Z0-9_]+$/) != null);
        },
 
+       'neg_network_ip4addr': function(v)
+       {
+               v = v.replace(/^\s*!/, "");
+               return cbi_validators.uciname(v) || cbi_validators.ip4addr(v);
+       },
+
        'range': function(v, args)
        {
                var min = parseInt(args[0]);
@@ -179,6 +207,54 @@ var cbi_validators = {
                        return ((val >= min) && (val <= max));
 
                return false;
+       },
+
+       'min': function(v, args)
+       {
+               var min = parseInt(args[0]);
+               var val = parseInt(v);
+
+               if (!isNaN(min) && !isNaN(val))
+                       return (val >= min);
+
+               return false;
+       },
+
+       'max': function(v, args)
+       {
+               var max = parseInt(args[0]);
+               var val = parseInt(v);
+
+               if (!isNaN(max) && !isNaN(val))
+                       return (val <= max);
+
+               return false;
+       },
+
+       'neg': function(v, args)
+       {
+               if (args[0] && typeof cbi_validators[args[0]] == "function")
+                       return cbi_validators[args[0]](v.replace(/^\s*!\s*/, ''));
+
+               return false;
+       },
+
+       'list': function(v, args)
+       {
+               var cb = cbi_validators[args[0] || 'string'];
+               if (typeof cb == "function")
+               {
+                       var cbargs = args.slice(1);
+                       var values = v.match(/[^\s]+/g);
+
+                       for (var i = 0; i < values.length; i++)
+                               if (!cb(values[i], cbargs))
+                                       return false;
+
+                       return true;
+               }
+
+               return false;
        }
 };
 
@@ -284,7 +360,8 @@ function cbi_d_update() {
        }
 
        if (entry && entry.parent) {
-               cbi_t_update();
+               if (!cbi_t_update())
+                       cbi_tag_last(parent);
        }
 
        if (state) {
@@ -402,18 +479,118 @@ function cbi_filebrowser(id, url, defpath) {
        browser.focus();
 }
 
-function cbi_dynlist_init(name)
+function cbi_browser_init(id, respath, url, defpath)
+{
+       function cbi_browser_btnclick(e) {
+               cbi_filebrowser(id, url, defpath);
+               return false;
+       }
+
+       var field = document.getElementById(id);
+
+       var btn = document.createElement('img');
+       btn.className = 'cbi-image-button';
+       btn.src = respath + '/cbi/folder.gif';
+       field.parentNode.insertBefore(btn, field.nextSibling);
+
+       cbi_bind(btn, 'click', cbi_browser_btnclick);
+}
+
+function cbi_dynlist_init(name, respath, datatype, optional, choices)
 {
-       function cbi_dynlist_renumber(e)
+       var input0 = document.getElementsByName(name)[0];
+       var prefix = input0.name;
+       var parent = input0.parentNode;
+
+       var values;
+
+       function cbi_dynlist_redraw(focus, add, del)
        {
-               var count = 1;
-               var childs = e.parentNode.childNodes;
+               values = [ ];
+
+               while (parent.firstChild)
+               {
+                       var n = parent.firstChild;
+                       var i = parseInt(n.index);
 
-               for( var i = 0; i < childs.length; i++ )
-                       if( childs[i].name == name )
-                               childs[i].id = name + '.' + (count++);
+                       if (i != del)
+                       {
+                               if (n.nodeName.toLowerCase() == 'input')
+                                       values.push(n.value || '');
+                               else if (n.nodeName.toLowerCase() == 'select')
+                                       values[values.length-1] = n.options[n.selectedIndex].value;
+                       }
+
+                       parent.removeChild(n);
+               }
 
-               e.focus();
+               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';
+
+                       var b = document.createElement('img');
+                               b.src = respath + ((i+1) < values.length ? '/cbi/remove.gif' : '/cbi/add.gif');
+                               b.className = 'cbi-image-button';
+
+                       parent.appendChild(t);
+                       parent.appendChild(b);
+                       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[0], '', choices[1]);
+                               t.nextSibling.index = i;
+
+                               cbi_bind(t.nextSibling, 'keydown',  cbi_dynlist_keydown);
+                               cbi_bind(t.nextSibling, 'keypress', cbi_dynlist_keypress);
+
+                               if (i == focus || -i == focus)
+                                       t.nextSibling.focus();
+                       }
+                       else
+                       {
+                               cbi_bind(t, 'keydown',  cbi_dynlist_keydown);
+                               cbi_bind(t, '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;
+                               }
+                       }
+
+                       cbi_bind(b, 'click', cbi_dynlist_btnclick);
+               }
        }
 
        function cbi_dynlist_keypress(ev)
@@ -470,24 +647,29 @@ function cbi_dynlist_init(name)
                while (next && next.name != name)
                        next = next.nextSibling;
 
+               /* advance one further in combobox case */
+               if (next && next.nextSibling.name == name)
+                       next = next.nextSibling;
+
                switch (ev.keyCode)
                {
                        /* backspace, delete */
                        case 8:
                        case 46:
-                               var jump = (ev.keyCode == 8)
-                                       ? (prev || next) : (next || prev);
+                               var del = (se.nodeName.toLowerCase() == 'select')
+                                       ? true : (se.value.length == 0);
 
-                               if (se.value.length == 0 && jump)
+                               if (del)
                                {
-                                       se.parentNode.removeChild(se.nextSibling);
-                                       se.parentNode.removeChild(se);
-
-                                       cbi_dynlist_renumber(jump);
-
                                        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;
                                }
 
@@ -495,31 +677,7 @@ function cbi_dynlist_init(name)
 
                        /* enter */
                        case 13:
-                               var n = document.createElement('input');
-                                       n.name       = se.name;
-                                       n.type       = se.type;
-
-                               cbi_bind(n, 'keydown',  cbi_dynlist_keydown);
-                               cbi_bind(n, 'keypress', cbi_dynlist_keypress);
-
-                               if (next)
-                               {
-                                       se.parentNode.insertBefore(n, next);
-                                       se.parentNode.insertBefore(document.createElement('br'), next);
-                               }
-                               else
-                               {
-                                       se.parentNode.appendChild(n);
-                                       se.parentNode.appendChild(document.createElement('br'));
-                               }
-
-                               var dt = se.getAttribute('cbi_datatype');
-                               var op = se.getAttribute('cbi_optional') == 'true';
-
-                               if (dt)
-                                       cbi_validate_field(n, op, dt);
-
-                               cbi_dynlist_renumber(n);
+                               cbi_dynlist_redraw(-1, se.index, -1);
                                break;
 
                        /* arrow up */
@@ -540,12 +698,33 @@ function cbi_dynlist_init(name)
                return true;
        }
 
-       var inputs = document.getElementsByName(name);
-       for( var i = 0; i < inputs.length; i++ )
+       function cbi_dynlist_btnclick(ev)
        {
-               cbi_bind(inputs[i], 'keydown',  cbi_dynlist_keydown);
-               cbi_bind(inputs[i], 'keypress', cbi_dynlist_keypress);
+               ev = ev ? ev : window.event;
+
+               var se = ev.target ? ev.target : ev.srcElement;
+
+               if (se.src.indexOf('remove') > -1)
+               {
+                       se.previousSibling.value = '';
+
+                       cbi_dynlist_keydown({
+                               target:  se.previousSibling,
+                               keyCode: 8
+                       });
+               }
+               else
+               {
+                       cbi_dynlist_keydown({
+                               target:  se.previousSibling,
+                               keyCode: 13
+                       });
+               }
+
+               return false;
        }
+
+       cbi_dynlist_redraw(-1, -1, -1);
 }
 
 //Hijacks the CBI form to send via XHR (requires Prototype)
@@ -602,9 +781,11 @@ function cbi_t_switch(section, tab) {
 
 function cbi_t_update() {
        var hl_tabs = [ ];
+       var updated = false;
 
        for( var sid in cbi_t )
                for( var tid in cbi_t[sid] )
+               {
                        if( cbi_c[cbi_t[sid][tid].cid] == 0 ) {
                                cbi_t[sid][tid].tab.style.display = 'none';
                        }
@@ -616,11 +797,17 @@ function cbi_t_update() {
                                hl_tabs.push(t);
                        }
 
+                       cbi_tag_last(cbi_t[sid][tid].container);
+                       updated = true;
+               }
+
        if( hl_tabs.length > 0 )
                window.setTimeout(function() {
                        for( var i = 0; i < hl_tabs.length; i++ )
                                hl_tabs[i].className = hl_tabs[i].className.replace(/ cbi-tab-highlighted/g, '');
                }, 750);
+
+       return updated;
 }
 
 
@@ -768,6 +955,26 @@ function cbi_row_swap(elem, up, store)
        return false;
 }
 
+function cbi_tag_last(container)
+{
+       var last;
+
+       for (var i = 0; i < container.childNodes.length; i++)
+       {
+               var c = container.childNodes[i];
+               if (c.nodeType == 1 && c.nodeName.toLowerCase() == 'div')
+               {
+                       c.className = c.className.replace(/ cbi-value-last$/, '');
+                       last = c;
+               }
+       }
+
+       if (last)
+       {
+               last.className += ' cbi-value-last';
+       }
+}
+
 if( ! String.serialize )
        String.serialize = function(o)
        {
@@ -838,7 +1045,7 @@ if( ! String.format )
 
                var str = arguments[0];
                var out = '';
-               var re = /^(([^%]*)%('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X|q|h|j|t))/;
+               var re = /^(([^%]*)%('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X|q|h|j|t|m))/;
                var a = b = [], numSubstitutions = 0, numMatches = 0;
 
                while( a = re.exec(str) )
@@ -957,6 +1164,20 @@ if( ! String.format )
                                                                : String.format('%dh %dm %ds', th, tm, ts);
 
                                                        break;
+
+                                               case 'm':
+                                                       var mf = pMinLength ? parseInt(pMinLength) : 1000;
+                                                       var pr = pPrecision ? Math.floor(10*parseFloat('0'+pPrecision)) : 2;
+
+                                                       var i = 0;
+                                                       var val = parseFloat(param || 0);
+                                                       var units = [ '', 'K', 'M', 'G', 'T', 'P', 'E' ];
+
+                                                       for (i = 0; (i < units.length) && (val > mf); i++)
+                                                               val /= mf;
+
+                                                       subst = val.toFixed(pr) + ' ' + units[i];
+                                                       break;
                                        }
                                }
                        }