Roo/bootstrap/TriggerField.js

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 5fb12a1..49927bd 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -1076,7 +1076,7 @@ Roo.extend(Roo.bootstrap.Column, Roo.bootstrap.Component,  {
                 return;
             }
             cfg.cls += ' col-' + size + '-' + settings[size] + (
-                size == 'xs' ? (' col-' + config[size] ) : '' // bs4 col-{num} replaces col-xs
+                size == 'xs' ? (' col-' + settings[size] ) : '' // bs4 col-{num} replaces col-xs
             );
             
         });
@@ -6876,7 +6876,7 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
                  
                 if (!config[size]) { // 0 = hidden
                     // BS 4 '0' is treated as hide that column and below.
-                    c.cls += ' hidden-' + size + ' hidden' + size + 'down';
+                    c.cls += ' hidden-' + size + ' hidden' + size + '-down';
                     return;
                 }
                 
@@ -7194,7 +7194,7 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
                   
                 if (!config[size]) { // 0 = hidden
                     // BS 4 '0' is treated as hide that column and below.
-                    td.cls += ' hidden-' + size + ' hidden' + size + 'down';
+                    td.cls += ' hidden-' + size + ' hidden' + size + '-down';
                     return;
                 }
                 
@@ -15390,7 +15390,8 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
             
             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,
                     {
@@ -15571,7 +15572,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
         
         this.originalValue = this.getValue();
         
-        this.triggerEl = this.el.select('span.dropdown-toggle',true).first();
+        this.triggerEl = this.el.select('span.input-group-append',true).first();
         
         this.inputEl().on("click", this.showTouchView, this);
         if (this.triggerEl) {