diff --git a/VERSION b/VERSION index a8933111..f55670fa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-23 16:31:41) stable +Version 2.0.9 (2012-09-23 16:58:06) stable diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js index e323398a..84b5b7b8 100644 --- a/applications/welcome/static/js/web2py.js +++ b/applications/welcome/static/js/web2py.js @@ -189,8 +189,14 @@ function web2py_calc_entropy(mystring) { function web2py_validate_entropy(myfield, req_entropy) { var validator = function () { var v = (web2py_calc_entropy(myfield.val())||0)/req_entropy; - var color ='#'+Math.round(((v<1)?1.0-v:0)*15).toString(16)+Math.round(((v<1)?v:0)*15).toString(16)+Math.round(((v<1)?0:1)*15).toString(16); + var r=0,g=0,b=0,rs=function(x){return Math.round(x*15).toString(16)}; + if(v<=0.5) {r=1.0; g=2.0*v;} + else if(v<1.0) {r=(1.0-2.0*(v-0.5)); g=1.0;} + else {g=Math.max(0,2.0-v); b=1.0;} + var color = '#'+rs(r)+rs(g)+rs(b); myfield.css('background-color',color); + entroy_callback = myfield.attr('entroy_callback'); + if(entropy_callback) entroy_callback(v); } if(myfield.attr('entropy_check')!=true) myfield.on('keyup', validator).on('keydown', validator).attr('entropy_check',true); }