From 47f5bca2f4c2c1a1221312dcde137e4fb5d61ee3 Mon Sep 17 00:00:00 2001 From: john Date: Thu, 7 Dec 2017 11:34:11 +0800 Subject: [PATCH] Roo/bootstrap/ComboBox.js --- Roo/bootstrap/ComboBox.js | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js index c34ee79c88..bb5f5f0f86 100644 --- a/Roo/bootstrap/ComboBox.js +++ b/Roo/bootstrap/ComboBox.js @@ -607,14 +607,14 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, { tag: 'label', //cls : 'input-group-addon', html : this.fieldLabel - - }, - - { - tag : 'i', - cls : 'roo-required-indicator right-indicator text-danger fa fa-lg fa-star', - tooltip : 'This field is required' - }, + cn: [ + { + tag : 'i', + cls : 'roo-required-indicator left-indicator text-danger fa fa-lg fa-star', + tooltip : 'This field is required' + } + ] + } combobox @@ -2329,16 +2329,18 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, { if (align ==='left' && this.fieldLabel.length) { cfg.cn = [ - { - tag : 'i', - cls : 'roo-required-indicator left-indicator text-danger fa fa-lg fa-star', - tooltip : 'This field is required' - }, + { tag: 'label', cls : 'control-label', html : this.fieldLabel - + cn : [ + { + tag : 'i', + cls : 'roo-required-indicator left-indicator text-danger fa fa-lg fa-star', + tooltip : 'This field is required' + } + ] }, { cls : '', -- 2.39.2