Skip to content

Commit 9240333

Browse files
committed
Fix mistic100#416 coordinates demo
1 parent f0fa29c commit 9240333

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

examples/index.html

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -365,10 +365,10 @@ <h3>Output</h3>
365365
validation: {
366366
format: /^[A-C]{1}.[1-6]{1}$/
367367
},
368-
input: function(rule) {
368+
input: function(rule, name) {
369369
var $container = rule.$el.find('.rule-value-container');
370370

371-
$container.on('change', '[name=coord_1]', function(){
371+
$container.on('change', '[name='+ name +'_1]', function(){
372372
var h = '';
373373

374374
switch ($(this).val()) {
@@ -383,27 +383,30 @@ <h3>Output</h3>
383383
break;
384384
}
385385

386-
$container.find('[name=coord_2]').html(h).toggle(h!='');
386+
$container.find('[name$=_2]')
387+
.html(h).toggle(!!h)
388+
.val('-1').trigger('change');
387389
});
388390

389391
return '\
390-
<select name="coord_1" class="form-control"> \
392+
<select name="'+ name +'_1"> \
391393
<option value="-1">-</option> \
392394
<option value="A">A</option> \
393395
<option value="B">B</option> \
394396
<option value="C">C</option> \
395397
</select> \
396-
<select name="coord_2" class="form-control" style="display:none;"></select>';
398+
<select name="'+ name +'_2" style="display:none;"></select>';
397399
},
398-
valueParser: function(rule, value) {
399-
return rule.$el.find('[name=coord_1]').val()
400-
+'.'+rule.$el.find('[name=coord_2]').val();
400+
valueGetter: function(rule) {
401+
return rule.$el.find('.rule-value-container [name$=_1]').val()
402+
+'.'+ rule.$el.find('.rule-value-container [name$=_2]').val();
401403
},
402404
valueSetter: function(rule, value) {
403-
if (rule.operator.nb_inputs !== 0) {
405+
if (rule.operator.nb_inputs > 0) {
404406
var val = value.split('.');
405-
rule.$el.find('[name=coord_1]').val(val[0]).trigger('change');
406-
rule.$el.find('[name=coord_2]').val(val[1]);
407+
408+
rule.$el.find('.rule-value-container [name$=_1]').val(val[0]).trigger('change');
409+
rule.$el.find('.rule-value-container [name$=_2]').val(val[1]).trigger('change');
407410
}
408411
}
409412
}]

0 commit comments

Comments
 (0)