Roo/form/ComboBoxArray.js

[roojs1] / Roo / form / ComboBoxArray.js

diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js
index d6b39a8..346c279 100644 (file)
--- a/Roo/form/ComboBoxArray.js
+++ b/Roo/form/ComboBoxArray.js
@@ -7,7 +7,7 @@
 
 /**
  * @class Roo.form.ComboBoxArray
- * @extends Roo.form.ComboBox
+ * @extends Roo.form.TextField
  * A facebook style adder... for lists of email / people / countries  etc...
  * pick multiple items from a combo box, and shows each one.
  *
@@ -73,7 +73,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
      */
     name : false,
     /**
-     * @cfg {String} name    The hidden name of the field, often contains an comma seperated list of names
+     * @cfg {String} hiddenName    The hidden name of the field, often contains an comma seperated list of names
      */
     hiddenName : false,
     
@@ -185,7 +185,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
         
         return;
         // not sure if this is needed..
-        this.combo.onResize(w,h);
+        //this.combo.onResize(w,h);
         
         if(typeof w != 'number'){
             // we do not handle it!?!?
@@ -211,9 +211,9 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
     
     addItem: function(rec)
     {
-        var idField = this.combo.valueField;
+        var valueField = this.combo.valueField;
         var displayField = this.combo.displayField;
-        if (this.items.indexOfKey(rec[idField]) > -1) {
+        if (this.items.indexOfKey(rec[valueField]) > -1) {
             //console.log("GOT " + rec.data.id);
             return;
         }
@@ -221,12 +221,12 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
         var x = new Roo.form.ComboBoxArray.Item({
             //id : rec[this.idField],
             data : rec,
-            nameField : displayField ,
+            displayField : displayField ,
             tipField : displayField ,
             cb : this
         });
         // use the 
-        this.items.add(rec[idField],x);
+        this.items.add(rec[valueField],x);
         // add it before the element..
         this.updateHiddenEl();
         x.render(this.outerWrap, this.wrap.dom);
@@ -252,10 +252,11 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
     
     reset : function()
     {
-        Roo.form.ComboBoxArray.superclass.reset.call(this); 
+        //Roo.form.ComboBoxArray.superclass.reset.call(this); 
         this.items.each(function(f) {
            f.remove(); 
         });
+        this.el.dom.value = '';
         if (this.hiddenEl) {
             this.hiddenEl.dom.value = '';
         }
@@ -268,8 +269,11 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
     setValue: function(v) // not a valid action - must use addItems..
     {
          
+        this.reset();
+        
+        
         
-        if (this.store.isLocal) {
+        if (this.store.isLocal) && (typeof(v) == 'string')) {
             // then we can use the store to find the values..
             // comma seperated at present.. this needs to allow JSON based encoding..
             this.hiddenEl.value  = v;
@@ -296,6 +300,12 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
     setFromData: function(v)
     {
         // this recieves an object, if setValues is called.
+        this.reset();
+        this.el.dom.value = v[this.displayField];
+        this.hiddenEl.dom.value = v[this.valueField];
+        if (typeof(v[this.valueField]) != 'string' || !v[this.valueField].length) {
+            return;
+        }
         var keys = v[this.valueField].split(',');
         var display = v[this.displayField].split(',');
         for (var i = 0 ; i < keys.length; i++) {
@@ -338,7 +348,7 @@ Roo.form.ComboBoxArray.Item = function(config) {
 Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, {
     data : {},
     cb: false,
-    nameField : false,
+    displayField : false,
     tipField : false,
     
     
@@ -372,7 +382,7 @@ Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, {
         
         this.el.child('div').dom.innerHTML = this.cb.renderer ? 
             this.cb.renderer(this.data) :
-            String.format('{0}',this.data[this.nameField]);
+            String.format('{0}',this.data[this.displayField]);
         
             
         this.el.child('div').dom.setAttribute('qtip',