fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 12:02:24 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue 1905 support the conditional statement of ruleset on radiobox and checkbox.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10564 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2012-04-17 00:47:51 +00:00
parent db95166c4d
commit 4566d43b38
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/js/xe.js
View file

@ -1779,7 +1779,6 @@ var Validator = xe.createApp('Validator', {
API_VALIDATE : function(sender, params) {
var result = true, form = params[0], elems = form.elements, filter, filter_to_add, ruleset, callback;
var fields, names, name, el, val, mod, len, lenb, max, min, maxb, minb, rules, e_el, e_val, i, c, r, if_, fn;
if(elems['ruleset']) filter = form.elements['ruleset'].value;
else if(elems['_filter']) filter = form.elements['_filter'].value;
if(!filter) return true;
@ -1844,8 +1843,11 @@ var Validator = xe.createApp('Validator', {
if(!$.isArray(f['if'])) f['if'] = [f['if']];
for(i=0;i<f['if'].length;i++) {
if_ = f['if'][i];
fn = new Function('el', 'return !!(' + (if_.test.replace(/\$(\w+)/g, 'el["$1"].value')) +')');
fn = new Function('el', 'return !!(' + (if_.test.replace(/\$(\w+)/g, '(jQuery(\'[name=$1]\').is(\':radio, :checkbox\') ? jQuery(\'[name=$1]:checked\').val() : jQuery(\'[name=$1]\').val())')) +')');
//fn = new Function('el', 'return !!(' + (if_.test.replace(/\$(\w+)/g, 'el["$1"].value')) +')');
if(fn(elems)) f[if_.attr] = if_.value;
else delete f[if_.attr];
}
}