Roo/bootstrap/ComboBox.js
authorEdward <edward@roojs.com>
Mon, 30 Mar 2015 09:14:47 +0000 (17:14 +0800)
committerEdward <edward@roojs.com>
Mon, 30 Mar 2015 09:14:47 +0000 (17:14 +0800)
Roo/bootstrap/ComboBox.js

index 965f655..adeb833 100644 (file)
@@ -1043,12 +1043,6 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
     setFromData : function(o){
         
         if(this.multiple){
-            if(typeof o.display_name !== 'string'){
-                for(var i=0;i<o.display_name.length;i++){
-                    this.addItem({'id':o.id[i],'display_name':o.display_name[i]});
-                }
-                return;
-            }
             this.addItem(o);
             return;
         }