X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-bootstrap-debug.js;h=7b2100bbf42ee35d4e117fcb9fa2e6fe46fdf510;hb=9bb8c460059f675124dabf9cbe9cae24bed3c6db;hp=7aa1f98e7a589cb695dfc2f7b3f1da6387d1323f;hpb=4ffc2acc70e8c4f8ce1fdb7e29a83ef637888d2a;p=roojs1 diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 7aa1f98e7a..7b2100bbf4 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -10450,7 +10450,7 @@ trigger.applyTo('my-field'); * {@link Roo.bootstrap.DateField} and {@link Roo.bootstrap.ComboBox} are perfect examples of this. * @cfg {String} triggerClass An additional CSS class used to style the trigger button. The trigger will always get the * class 'x-form-trigger' by default and triggerClass will be appended if specified. - * @cfg {String} caret (search|calendar) a fontawesome for the trigger icon see http://fortawesome.github.io/Font-Awesome/icons/ + * @cfg {String} caret (search|calendar) BS3 only - carat fa name * @constructor * Create a new TriggerField. @@ -10658,7 +10658,7 @@ Roo.extend(Roo.bootstrap.TriggerField, Roo.bootstrap.Input, { tag :'span', cls : 'input-group-addon input-group-append input-group-text btn dropdown-toggle', cn : [ - caret, + Roo.bootstrap.version == 3 ? caret : '', { tag: 'span', cls: 'combobox-clear',