#18592325 xml js filter에 확장 변수 처리 추가

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7126 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
taggon 2010-01-06 05:30:21 +00:00
parent 27317eec99
commit 62387a364b
2 changed files with 49 additions and 29 deletions

View file

@ -12,6 +12,7 @@ var messages = [];
var rules = [];
var filters = [];
var callbacks = [];
var extras = {};
var Validator = xe.createApp('Validator', {
init : function() {
@ -48,7 +49,7 @@ var Validator = xe.createApp('Validator', {
this.cast('ADD_RULE', ['alpha_number', regAlphaNum]);
// number
var regNum = /^[0-9]*$/i;
var regNum = /^[0-9]*$/;
this.cast('ADD_RULE', ['number', regNum]);
// }}} add filters
},
@ -85,7 +86,7 @@ var Validator = xe.createApp('Validator', {
if (form.elements['_filter']) filter = form.elements['_filter'].value;
if (!filter) return true;
if ($.isFunction(callbacks[filter])) callback = callbacks[filter];
filter = filters[filter.toLowerCase()] || null;
filter = $.extend({}, filters[filter.toLowerCase()] || {}, extras);
$.each(filter, function(name) {
var _el = form.elements[name];
@ -158,6 +159,20 @@ var Validator = xe.createApp('Validator', {
return null;
}
},
API_ADD_EXTRA_FIELD : function(sender, params) {
var name = params[0].toLowerCase();
var prop = params[1];
extras[name] = prop;
},
API_GET_EXTRA_FIELD : function(sender, params) {
var name = params[0].toLowerCase();
return extras[name];
},
API_DEL_EXTRA_FIELD : function(sender, params) {
var name = params[0].toLowerCase();
delete extras[name];
},
API_APPLY_RULE : function(sender, params) {
var name = params[0].toLowerCase();
var value = params[1];
@ -235,10 +250,10 @@ oValidator.registerPlugin(new EditorStub);
// functions
function get_value(elem) {
var vals = [];
if (elem.is(':radio')){
return elem.filter(':checked').val();
} else if (elem.is(':checkbox')) {
var vals = [];
elem.filter(':checked').each(function(){
vals.push(this.value);
});

View file

@ -1007,18 +1007,23 @@
$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
if(!count($extra_keys)) return;
$js_code = "";
$js_code = array();
$js_code[] = '<script type="text/javascript">//<![CDATA[';
$js_code[] = '(function($){';
$js_code[] = 'var validator = xe.getApp("validator")[0];';
$js_code[] = 'if(!validator) return false;';
$logged_info = Context::get('logged_info');
foreach($extra_keys as $idx => $val) {
$js_code .= sprintf('alertMsg["extra_vars%s"] = "%s";', $val->idx, $val->name);
$js_code .= sprintf('target_type_list["extra_vars%s"] = "%s";', $val->idx, $val->type);
$js_code .= sprintf('extra_vars[extra_vars.length] = "extra_vars%s";', $val->idx);
if($val->is_required == 'Y' && $logged_info->is_admin != 'Y') $js_code .= sprintf('notnull_list[notnull_list.length] = "extra_vars%s";',$val->idx);
$js_code[] = sprintf('validator.cast("ADD_MESSAGE", ["extra_vars%s","%s"]);', $val->idx, $val->name);
if($val->is_required == 'Y' && $logged_info->is_admin != 'Y') $js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $val->idx);
}
$js_code = "<script type=\"text/javascript\">//<![CDATA[\n".$js_code."\n//]]></script>";
$js_code[] = '})(jQuery);';
$js_code[] = '//]]></script>';
$js_code = implode("\n", $js_code);
Context::addHtmlHeader($js_code);
}