X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fweb%2Fhtdocs%2Fluci-static%2Fresources%2Fcbi.js;h=e89658dc961b63db64d423e2b8d99a5245060bce;hp=05e15d27a06f6e06dbbe7fdab4ea314cdcc1030c;hb=7fd1bb58313bf63e383a422ba3336715b496e49f;hpb=3812f2908731c6ff5e59aec4e0c899dbff35c469 diff --git a/libs/web/htdocs/luci-static/resources/cbi.js b/libs/web/htdocs/luci-static/resources/cbi.js index 05e15d27a..e89658dc9 100644 --- a/libs/web/htdocs/luci-static/resources/cbi.js +++ b/libs/web/htdocs/luci-static/resources/cbi.js @@ -2,7 +2,7 @@ LuCI - Lua Configuration Interface Copyright 2008 Steven Barth - Copyright 2008-2011 Jo-Philipp Wich + Copyright 2008-2012 Jo-Philipp Wich Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,34 +17,35 @@ var cbi_c = []; var cbi_validators = { - 'integer': function(v) + 'integer': function() { - return (v.match(/^-?[0-9]+$/) != null); + return (this.match(/^-?[0-9]+$/) != null); }, - 'uinteger': function(v) + 'uinteger': function() { - return (cbi_validators.integer(v) && (v >= 0)); + return (cbi_validators.integer.apply(this) && (this >= 0)); }, - 'float': function(v) + 'float': function() { - return !isNaN(parseFloat(v)); + return !isNaN(parseFloat(this)); }, - 'ufloat': function(v) + 'ufloat': function() { - return (cbi_validators['float'](v) && (v >= 0)); + return (cbi_validators['float'].apply(this) && (this >= 0)); }, - 'ipaddr': function(v) + 'ipaddr': function() { - return cbi_validators.ip4addr(v) || cbi_validators.ip6addr(v); + return cbi_validators.ip4addr.apply(this) || + cbi_validators.ip6addr.apply(this); }, - 'ip4addr': function(v) + 'ip4addr': function() { - if (v.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(\/(\S+))?$/)) + if (this.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) && @@ -52,16 +53,16 @@ var cbi_validators = { (RegExp.$4 >= 0) && (RegExp.$4 <= 255) && ((RegExp.$6.indexOf('.') < 0) ? ((RegExp.$6 >= 0) && (RegExp.$6 <= 32)) - : (cbi_validators.ip4addr(RegExp.$6))) + : (cbi_validators.ip4addr.apply(RegExp.$6))) ; } return false; }, - 'ip6addr': function(v) + 'ip6addr': function() { - if( v.match(/^([a-fA-F0-9:.]+)(\/(\d+))?$/) ) + if( this.match(/^([a-fA-F0-9:.]+)(\/(\d+))?$/) ) { if( !RegExp.$2 || ((RegExp.$3 >= 0) && (RegExp.$3 <= 128)) ) { @@ -76,7 +77,7 @@ var cbi_validators = { { var off = addr.lastIndexOf(':'); - if( !(off && cbi_validators.ip4addr(addr.substr(off+1))) ) + if( !(off && cbi_validators.ip4addr.apply(addr.substr(off+1))) ) return false; addr = addr.substr(0, off) + ':0:0'; @@ -109,65 +110,72 @@ var cbi_validators = { return false; }, - 'port': function(v) + 'port': function() { - return cbi_validators.integer(v) && (v >= 0) && (v <= 65535); + return cbi_validators.integer.apply(this) && + (this >= 0) && (this <= 65535); }, - 'portrange': function(v) + 'portrange': function() { - if( v.match(/^(\d+)-(\d+)$/) ) + if (this.match(/^(\d+)-(\d+)$/)) { var p1 = RegExp.$1; var p2 = RegExp.$2; - return cbi_validators.port(p1) && - cbi_validators.port(p2) && + return cbi_validators.port.apply(p1) && + cbi_validators.port.apply(p2) && (parseInt(p1) <= parseInt(p2)) ; } else { - return cbi_validators.port(v); + return cbi_validators.port.apply(this); } }, - 'macaddr': function(v) + 'macaddr': function() { - return (v.match(/^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/) != null); + return (this.match(/^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/) != null); }, - 'host': function(v) + 'host': function() { - return cbi_validators.hostname(v) || cbi_validators.ipaddr(v); + return cbi_validators.hostname.apply(this) || + cbi_validators.ipaddr.apply(this); }, - 'hostname': function(v) + 'hostname': function() { - 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.]/))); + if (this.length <= 253) + return (this.match(/^[a-zA-Z0-9]+$/) != null || + (this.match(/^[a-zA-Z0-9_][a-zA-Z0-9_\-.]*[a-zA-Z0-9]$/) && + this.match(/[^0-9.]/))); return false; }, - 'network': function(v) + 'network': function() { - return cbi_validators.uciname(v) || cbi_validators.host(v); + return cbi_validators.uciname.apply(this) || + cbi_validators.host.apply(this); }, - 'wpakey': function(v) + 'wpakey': function() { + var v = this; + if( v.length == 64 ) return (v.match(/^[a-fA-F0-9]{64}$/) != null); else return (v.length >= 8) && (v.length <= 63); }, - 'wepkey': function(v) + 'wepkey': function() { - if( v.substr(0,2) == 's:' ) + var v = this; + + if ( v.substr(0,2) == 's:' ) v = v.substr(2); if( (v.length == 10) || (v.length == 26) ) @@ -176,69 +184,122 @@ var cbi_validators = { return (v.length == 5) || (v.length == 13); }, - 'uciname': function(v) + 'uciname': function() { - return (v.match(/^[a-zA-Z0-9_]+$/) != null); + return (this.match(/^[a-zA-Z0-9_]+$/) != null); }, - 'range': function(v, args) + 'range': function(min, max) { - var min = parseInt(args[0]); - var max = parseInt(args[1]); - var val = parseInt(v); - + var val = parseFloat(this); if (!isNaN(min) && !isNaN(max) && !isNaN(val)) return ((val >= min) && (val <= max)); return false; }, - 'min': function(v, args) + 'min': function(min) { - var min = parseInt(args[0]); - var val = parseInt(v); - + var val = parseFloat(this); if (!isNaN(min) && !isNaN(val)) return (val >= min); return false; }, - 'max': function(v, args) + 'max': function(max) { - var max = parseInt(args[0]); - var val = parseInt(v); - + var val = parseFloat(this); if (!isNaN(max) && !isNaN(val)) return (val <= max); return false; }, - 'neg': function(v, args) + 'rangelength': function(min, max) + { + var val = '' + this; + if (!isNaN(min) && !isNaN(max)) + return ((val.length >= min) && (val.length <= max)); + + return false; + }, + + 'minlength': function(min) { - if (args[0] && typeof cbi_validators[args[0]] == "function") - return cbi_validators[args[0]](v.replace(/^\s*!\s*/, '')); + var val = '' + this; + if (!isNaN(min)) + return (val.length >= min); return false; }, - 'list': function(v, args) + 'maxlength': function(max) { - var cb = cbi_validators[args[0] || 'string']; - if (typeof cb == "function") + var val = '' + this; + if (!isNaN(max)) + return (val.length <= max); + + return false; + }, + + 'or': function() + { + for (var i = 0; i < arguments.length; i += 2) { - var cbargs = args.slice(1); - var values = v.match(/[^\s]+/g); + if (typeof arguments[i] != 'function') + { + if (arguments[i] == this) + return true; + i--; + } + else if (arguments[i].apply(this, arguments[i+1])) + { + return true; + } + } + return false; + }, - for (var i = 0; i < values.length; i++) - if (!cb(values[i], cbargs)) + 'and': function() + { + for (var i = 0; i < arguments.length; i += 2) + { + if (typeof arguments[i] != 'function') + { + if (arguments[i] != this) return false; - - return true; + i--; + } + else if (!arguments[i].apply(this, arguments[i+1])) + { + return false; + } } + return true; + }, - return false; + 'neg': function() + { + return cbi_validators.or.apply( + this.replace(/^[ \t]*![ \t]*/, ''), arguments); + }, + + 'list': function(subvalidator, subargs) + { + if (typeof subvalidator != 'function') + return false; + + var tokens = this.match(/[^ \t]+/g); + for (var i = 0; i < tokens.length; i++) + if (!subvalidator.apply(tokens[i], subargs)) + return false; + + return true; + }, + 'phonedigit': function() + { + return (this.match(/^[0-9\*#]+$/) != null); } }; @@ -274,7 +335,7 @@ function cbi_d_checkvalue(target, ref) { if (!t) { var tl = document.getElementsByName(target); - if( tl.length > 0 && tl[0].type == 'radio' ) + if( tl.length > 0 && (tl[0].type == 'radio' || tl[0].type == 'checkbox')) for( var i = 0; i < tl.length; i++ ) if( tl[i].checked ) { value = tl[i].value; @@ -380,7 +441,7 @@ function cbi_combobox(id, values, def, man) { var obj = document.getElementById(id) var sel = document.createElement("select"); sel.id = selid; - sel.className = 'cbi-input-select'; + sel.className = obj.className.replace(/cbi-input-text/, 'cbi-input-select'); if (obj.nextSibling) { obj.parentNode.insertBefore(sel, obj.nextSibling); @@ -443,6 +504,10 @@ function cbi_combobox(id, values, def, man) { //Do nothing } }) + + // Retrigger validation in select + sel.focus(); + sel.blur(); } function cbi_combobox_init(id, values, def, man) { @@ -714,7 +779,7 @@ function cbi_dynlist_init(name, respath, datatype, optional, choices) return false; } - cbi_dynlist_redraw(-1, -1, -1); + cbi_dynlist_redraw(NaN, -1, -1); } //Hijacks the CBI form to send via XHR (requires Prototype) @@ -832,20 +897,87 @@ function cbi_validate_reset(form) return true; } -function cbi_validate_field(cbid, optional, type) +function cbi_validate_compile(code) { - var field = (typeof cbid == "string") ? document.getElementById(cbid) : cbid; - var vargs; + var pos = 0; + var esc = false; + var depth = 0; + var stack = [ ]; + + code += ','; - if( type.match(/^(\w+)\(([^\(\)]+)\)/) ) + for (var i = 0; i < code.length; i++) { - type = RegExp.$1; - vargs = RegExp.$2.split(/\s*,\s*/); + if (esc) + { + esc = false; + continue; + } + + switch (code.charCodeAt(i)) + { + case 92: + esc = true; + break; + + case 40: + case 44: + if (depth <= 0) + { + if (pos < i) + { + var label = code.substring(pos, i); + label = label.replace(/\\(.)/g, '$1'); + label = label.replace(/^[ \t]+/g, ''); + label = label.replace(/[ \t]+$/g, ''); + + if (label && !isNaN(label)) + { + stack.push(parseFloat(label)); + } + else if (label.match(/^(['"]).*\1$/)) + { + stack.push(label.replace(/^(['"])(.*)\1$/, '$2')); + } + else if (typeof cbi_validators[label] == 'function') + { + stack.push(cbi_validators[label]); + stack.push(null); + } + else + { + throw "Syntax error, unhandled token '"+label+"'"; + } + } + pos = i+1; + } + depth += (code.charCodeAt(i) == 40); + break; + + case 41: + if (--depth <= 0) + { + if (typeof stack[stack.length-2] != 'function') + throw "Syntax error, argument list follows non-function"; + + stack[stack.length-1] = + arguments.callee(code.substring(pos, i)); + + pos = i+1; + } + break; + } } - var vldcb = cbi_validators[type]; + return stack; +} - if( field && vldcb ) +function cbi_validate_field(cbid, optional, type) +{ + var field = (typeof cbid == "string") ? document.getElementById(cbid) : cbid; + var vstack; try { vstack = cbi_validate_compile(type); } catch(e) { }; + + if (field && vstack && typeof vstack[0] == "function") { var validator = function() { @@ -858,7 +990,7 @@ function cbi_validate_field(cbid, optional, type) var value = (field.options && field.options.selectedIndex > -1) ? field.options[field.options.selectedIndex].value : field.value; - if( !(((value.length == 0) && optional) || vldcb(value, vargs)) ) + if (!(((value.length == 0) && optional) || vstack[0].apply(value, vstack[1]))) { // invalid field.className += ' cbi-input-invalid'; @@ -965,216 +1097,243 @@ function cbi_tag_last(container) } } -if( ! String.serialize ) - String.serialize = function(o) +String.prototype.serialize = function() +{ + var o = this; + switch(typeof(o)) { - switch(typeof(o)) - { - case 'object': - // null - if( o == null ) - { - return 'null'; - } + case 'object': + // null + if( o == null ) + { + return 'null'; + } - // array - else if( o.length ) - { - var i, s = ''; + // array + else if( o.length ) + { + var i, s = ''; - for( var i = 0; i < o.length; i++ ) - s += (s ? ', ' : '') + String.serialize(o[i]); + for( var i = 0; i < o.length; i++ ) + s += (s ? ', ' : '') + String.serialize(o[i]); - return '[ ' + s + ' ]'; - } + return '[ ' + s + ' ]'; + } - // object - else - { - var k, s = ''; + // object + else + { + var k, s = ''; - for( k in o ) - s += (s ? ', ' : '') + k + ': ' + String.serialize(o[k]); + for( k in o ) + s += (s ? ', ' : '') + k + ': ' + String.serialize(o[k]); - return '{ ' + s + ' }'; - } + return '{ ' + s + ' }'; + } - break; + break; - case 'string': - // complex string - if( o.match(/[^a-zA-Z0-9_,.: -]/) ) - return 'decodeURIComponent("' + encodeURIComponent(o) + '")'; + case 'string': + // complex string + if( o.match(/[^a-zA-Z0-9_,.: -]/) ) + return 'decodeURIComponent("' + encodeURIComponent(o) + '")'; - // simple string - else - return '"' + o + '"'; + // simple string + else + return '"' + o + '"'; - break; + break; - default: - return o.toString(); - } + default: + return o.toString(); } +} +String.prototype.format = function() +{ + if (!RegExp) + return; -if( ! String.format ) - String.format = function() - { - if (!arguments || arguments.length < 1 || !RegExp) - return; - - var html_esc = [/&/g, '&', /"/g, '"', /'/g, ''', //g, '>']; - var quot_esc = [/"/g, '"', /'/g, ''']; + var html_esc = [/&/g, '&', /"/g, '"', /'/g, ''', //g, '>']; + var quot_esc = [/"/g, '"', /'/g, ''']; - function esc(s, r) { - for( var i = 0; i < r.length; i += 2 ) - s = s.replace(r[i], r[i+1]); - return s; - } + function esc(s, r) { + for( var i = 0; i < r.length; i += 2 ) + s = s.replace(r[i], r[i+1]); + return s; + } - 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|m))/; - var a = b = [], numSubstitutions = 0, numMatches = 0; + var str = this; + var out = ''; + 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) ) - { - var m = a[1]; - var leftpart = a[2], pPad = a[3], pJustify = a[4], pMinLength = a[5]; - var pPrecision = a[6], pType = a[7]; + while( a = re.exec(str) ) + { + var m = a[1]; + var leftpart = a[2], pPad = a[3], pJustify = a[4], pMinLength = a[5]; + var pPrecision = a[6], pType = a[7]; - numMatches++; + numMatches++; - if (pType == '%') - { - subst = '%'; - } - else + if (pType == '%') + { + subst = '%'; + } + else + { + if (numSubstitutions < arguments.length) { - if (numSubstitutions++ < arguments.length) - { - var param = arguments[numSubstitutions]; + var param = arguments[numSubstitutions++]; - var pad = ''; - if (pPad && pPad.substr(0,1) == "'") - pad = leftpart.substr(1,1); - else if (pPad) - pad = pPad; + var pad = ''; + if (pPad && pPad.substr(0,1) == "'") + pad = leftpart.substr(1,1); + else if (pPad) + pad = pPad; - var justifyRight = true; - if (pJustify && pJustify === "-") - justifyRight = false; + var justifyRight = true; + if (pJustify && pJustify === "-") + justifyRight = false; - var minLength = -1; - if (pMinLength) - minLength = parseInt(pMinLength); + var minLength = -1; + if (pMinLength) + minLength = parseInt(pMinLength); - var precision = -1; - if (pPrecision && pType == 'f') - precision = parseInt(pPrecision.substring(1)); + var precision = -1; + if (pPrecision && pType == 'f') + precision = parseInt(pPrecision.substring(1)); - var subst = param; + var subst = param; - switch(pType) - { - case 'b': - subst = (parseInt(param) || 0).toString(2); - break; - - case 'c': - subst = String.fromCharCode(parseInt(param) || 0); - break; - - case 'd': - subst = (parseInt(param) || 0); - break; - - case 'u': - subst = Math.abs(parseInt(param) || 0); - break; - - case 'f': - subst = (precision > -1) - ? ((parseFloat(param) || 0.0)).toFixed(precision) - : (parseFloat(param) || 0.0); - break; - - case 'o': - subst = (parseInt(param) || 0).toString(8); - break; - - case 's': - subst = param; - break; - - case 'x': - subst = ('' + (parseInt(param) || 0).toString(16)).toLowerCase(); - break; - - case 'X': - subst = ('' + (parseInt(param) || 0).toString(16)).toUpperCase(); - break; - - case 'h': - subst = esc(param, html_esc); - break; - - case 'q': - subst = esc(param, quot_esc); - break; - - case 'j': - subst = String.serialize(param); - break; - - case 't': - var td = 0; - var th = 0; - var tm = 0; - var ts = (param || 0); - - if (ts > 60) { - tm = Math.floor(ts / 60); - ts = (ts % 60); - } - - if (tm > 60) { - th = Math.floor(tm / 60); - tm = (tm % 60); - } - - if (th > 24) { - td = Math.floor(th / 24); - th = (th % 24); - } - - subst = (td > 0) - ? String.format('%dd %dh %dm %ds', td, th, tm, ts) - : 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; - } + switch(pType) + { + case 'b': + subst = (parseInt(param) || 0).toString(2); + break; + + case 'c': + subst = String.fromCharCode(parseInt(param) || 0); + break; + + case 'd': + subst = (parseInt(param) || 0); + break; + + case 'u': + subst = Math.abs(parseInt(param) || 0); + break; + + case 'f': + subst = (precision > -1) + ? ((parseFloat(param) || 0.0)).toFixed(precision) + : (parseFloat(param) || 0.0); + break; + + case 'o': + subst = (parseInt(param) || 0).toString(8); + break; + + case 's': + subst = param; + break; + + case 'x': + subst = ('' + (parseInt(param) || 0).toString(16)).toLowerCase(); + break; + + case 'X': + subst = ('' + (parseInt(param) || 0).toString(16)).toUpperCase(); + break; + + case 'h': + subst = esc(param, html_esc); + break; + + case 'q': + subst = esc(param, quot_esc); + break; + + case 'j': + subst = String.serialize(param); + break; + + case 't': + var td = 0; + var th = 0; + var tm = 0; + var ts = (param || 0); + + if (ts > 60) { + tm = Math.floor(ts / 60); + ts = (ts % 60); + } + + if (tm > 60) { + th = Math.floor(tm / 60); + tm = (tm % 60); + } + + if (th > 24) { + td = Math.floor(th / 24); + th = (th % 24); + } + + subst = (td > 0) + ? String.format('%dd %dh %dm %ds', td, th, tm, ts) + : 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; } } - - out += leftpart + subst; - str = str.substr(m.length); } - return out + str; + out += leftpart + subst; + str = str.substr(m.length); } + + return out + str; +} + +String.prototype.nobr = function() +{ + return this.replace(/[\s\n]+/g, ' '); +} + +String.serialize = function() +{ + var a = [ ]; + for (var i = 1; i < arguments.length; i++) + a.push(arguments[i]); + return ''.serialize.apply(arguments[0], a); +} + +String.format = function() +{ + var a = [ ]; + for (var i = 1; i < arguments.length; i++) + a.push(arguments[i]); + return ''.format.apply(arguments[0], a); +} + +String.nobr = function() +{ + var a = [ ]; + for (var i = 1; i < arguments.length; i++) + a.push(arguments[i]); + return ''.nobr.apply(arguments[0], a); +}