Roo/bootstrap/ComboBox.js

[roojs1] / Roo / bootstrap / ComboBox.js

diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js
index 0ad6031..fb9ceb5 100644 (file)
--- a/Roo/bootstrap/ComboBox.js
+++ b/Roo/bootstrap/ComboBox.js
@@ -1337,6 +1337,8 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
      */
     setFromData : function(o){
         
+        Roo.log(o);
+        
         if(this.multiple){
             this.addItem(o);
             return;
@@ -1698,7 +1700,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
                 }
             }else{
                 this.selectedIndex = -1;
-                this.onLoad();
+                this.onLoad();   
             }
         }
         
@@ -1939,7 +1941,6 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
         this.loading = this.list.select('.loading', true).first();
         
         if(this.loading === null){
-            Roo.log('here????');
             this.list.createChild({
                 tag: 'div',
                 cls: 'loading roo-select2-more-results roo-select2-active',