From: Alan Knowles Date: Thu, 24 Jan 2019 08:40:45 +0000 (+0800) Subject: Roo/bootstrap/TriggerField.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=12dbb6474b4bf61cf804c72226f108a6b118324b Roo/bootstrap/TriggerField.js --- diff --git a/Roo/bootstrap/TriggerField.js b/Roo/bootstrap/TriggerField.js index b9fc8faa53..33598f4865 100644 --- a/Roo/bootstrap/TriggerField.js +++ b/Roo/bootstrap/TriggerField.js @@ -228,7 +228,8 @@ Roo.extend(Roo.bootstrap.TriggerField, Roo.bootstrap.Input, { combobox.cn.push({ tag :'span', - cls : 'input-group-addon input-group-append input-group-text btn dropdown-toggle', + cls : 'input-group-addon input-group-append input-group-text btn' + + (Roo.bootstrap.version == 3 ? ' dropdown-toggle' : ''), cn : [ caret, { @@ -434,7 +435,7 @@ Roo.extend(Roo.bootstrap.TriggerField, Roo.bootstrap.Input, { Roo.bootstrap.TriggerField.superclass.initEvents.call(this); //this.wrap = this.el.wrap({cls: "x-form-field-wrap"}); if(!this.multiple && this.showToggleBtn){ - this.trigger = this.el.select('span.dropdown-toggle',true).first(); + this.trigger = this.el.select('span.input-group-append',true).first(); if(this.hideTrigger){ this.trigger.setDisplayed(false); }