X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-bootstrap-debug.js;h=e81543e8790c5cf1bea32623fc25f03d0cdec26b;hb=66d45bc0c3e910fc9477a810ba13c375f95a2df0;hp=417f19083ab36756c7978a8164243ceaafdf8c05;hpb=115bfd9767359ab843e5760efc0b98c4dc3815e1;p=roojs1 diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 417f19083a..e81543e879 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -13953,14 +13953,14 @@ Roo.extend(Roo.bootstrap.form.TriggerField, Roo.bootstrap.form.Input, { cls : 'roo-required-indicator ' + (this.indicatorpos == 'right' ? 'right' : 'left') +'-indicator text-danger fa fa-lg fa-star', tooltip : 'This field is required' }; - /* - if (Roo.bootstrap.version == 4) { + + if (this.allowBlank) { indicator = { tag : 'i', style : 'display:none' }; } - */ + if (align ==='left' && this.fieldLabel.length) { @@ -17319,14 +17319,13 @@ Roo.extend(Roo.bootstrap.form.ComboBox, Roo.bootstrap.form.TriggerField, { cls : 'roo-required-indicator ' + (this.indicatorpos == 'right' ? 'right' : 'left') +'-indicator text-danger fa fa-lg fa-star', tooltip : 'This field is required' }; - /* - * why? - if (Roo.bootstrap.version == 4) { + + if (this.allowBlank) { indicator = { tag : 'i', style : 'display:none' }; - }*/ + } if (align ==='left' && this.fieldLabel.length) { cfg.cls += ' roo-form-group-label-left' + (Roo.bootstrap.version == 4 ? ' row' : '');