Roo/bootstrap/form/MultiLineTag.js

roojs-bootstrap.js
roojs-bootstrap-debug.js

diff --git a/Roo/bootstrap/form/MultiLineTag.js b/Roo/bootstrap/form/MultiLineTag.js
index e219d24..c01f3ac 100644 (file)
--- a/Roo/bootstrap/form/MultiLineTag.js
+++ b/Roo/bootstrap/form/MultiLineTag.js
@@ -136,6 +136,7 @@ Roo.extend(Roo.bootstrap.form.MultiLineTag, Roo.bootstrap.form.Input,  {
 
                     this.removeBtn.on('click', function() {
                         _this.removeTagRow(_self);
+                        this.fireEvent('change', this, this.getValue(), false);
                     });
                 }
             }
@@ -159,12 +160,11 @@ Roo.extend(Roo.bootstrap.form.MultiLineTag, Roo.bootstrap.form.Input,  {
         return ret;
     },
 
-    removeTagRow : function(row)
+    removeTagRow : function(row,)
     {
         Roo.log('removeTagRow');
         row.destroy();
         this.tagRows.splice(this.tagRows.indexOf(row), 1);
-        this.fireEvent('change', this, this.getValue(), false);
         this.showHideRemoveBtn();
     },
 

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 19b76b6..291a9af 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -14890,6 +14890,7 @@ Roo.extend(Roo.bootstrap.form.MultiLineTag, Roo.bootstrap.form.Input,  {
 
                     this.removeBtn.on('click', function() {
                         _this.removeTagRow(_self);
+                        this.fireEvent('change', this, this.getValue(), false);
                     });
                 }
             }
@@ -14913,12 +14914,11 @@ Roo.extend(Roo.bootstrap.form.MultiLineTag, Roo.bootstrap.form.Input,  {
         return ret;
     },
 
-    removeTagRow : function(row)
+    removeTagRow : function(row,)
     {
         Roo.log('removeTagRow');
         row.destroy();
         this.tagRows.splice(this.tagRows.indexOf(row), 1);
-        this.fireEvent('change', this, this.getValue(), false);
         this.showHideRemoveBtn();
     },
 

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index e3c2cca..d61360d 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -631,11 +631,11 @@ Roo.bootstrap.form.MultiLineTag=function(A){Roo.bootstrap.form.MultiLineTag.supe
 ;A=this.getAutoCreateLabel(A,{cls:'roo-multi-line-tag-container'});return A;},initEvents:function(){this.tagRows=[];for(var i=0;i<this.minimumRow;i++){this.addTagRow();}},addTagRow:function(){var A=this;var B=Roo.factory({xns:Roo.bootstrap.form,xtype:'ComboBox',editable:true,triggerAction:'all',minChars:A.minChars,displayField:A.displayField,valueField:A.valueField,listWidth:A.listWidth,placeholder:A.placeholder,queryParam:A.queryParam,store:{xns:Roo.data,xtype:'Store',listeners:{beforeload:function(E,F){A.fireEvent('beforeload',A,E,F);
 }},proxy:{xns:Roo.data,xtype:'HttpProxy',method:'GET',url:A.url},reader:{xns:Roo.data,xtype:'JsonReader',fields:A.fields}},listeners:{'render':function(E){E.inputEl().on('keyup',function(e){if(A.shouldAutoAddTagRow()){A.addTagRow();}});E.inputEl().on('change',function(e){A.fireEvent('change',A,A.getValue(),false);
 A.showHideRemoveBtn();});},'select':function(E,F,G){A.fireEvent('change',A,A.getValue(),false);}}});var C=Roo.factory({xns:Roo.bootstrap,xtype:'Button',html:'-'});var D={xns:Roo.bootstrap,xtype:'Row',items:[B,C],listeners:{'render':function(E){this.inputCb=B;
-this.removeBtn=C;this.removeBtn.on('click',function(){A.removeTagRow(E);});}}};this.tagRows.push(this.addxtype(D));A.showHideRemoveBtn();},shouldAutoAddTagRow:function(){var A=true;Roo.each(this.tagRows,function(r){if(r.inputCb.getRawValue()==''){A=false;
-}});return A;},removeTagRow:function(A){Roo.log('removeTagRow');A.destroy();this.tagRows.splice(this.tagRows.indexOf(A),1);this.fireEvent('change',this,this.getValue(),false);this.showHideRemoveBtn();},showHideRemoveBtn:function(){var A=this;Roo.each(this.tagRows,function(r){r.removeBtn.show();
-if(A.tagRows.length<=A.minimumRow||r.inputCb.getRawValue()==''){r.removeBtn.hide();}});},getValue:function(){var A=this;var B=[];Roo.each(A.tagRows,function(r){var C=r.inputCb.getRawValue();if(C!=''){var D={};D[A.valueField]=r.inputCb.getRawValue();B.push(D);
-}});return JSON.stringify(B);},setValue:function(A){var B=this.tagRows.length;for(var i=0;i<B;i++){this.removeTagRow(this.tagRows[0]);}var C=[];try{C=JSON.parse(A);}catch{}Roo.log(C);for(var i=0;i<C.length;i++){this.addTagRow();this.tagRows[i].inputCb.setRawValue(C[i][this.valueField]);
-}this.addTagRow();while(this.tagRows.length<this.minimumRow){this.addTagRow();}},getChildContainer:function(){return Roo.select('.roo-multi-line-tag-container',true).elements[0];}});
+this.removeBtn=C;this.removeBtn.on('click',function(){A.removeTagRow(E);this.fireEvent('change',this,this.getValue(),false);});}}};this.tagRows.push(this.addxtype(D));A.showHideRemoveBtn();},shouldAutoAddTagRow:function(){var A=true;Roo.each(this.tagRows,function(r){if(r.inputCb.getRawValue()==''){A=false;
+}});return A;},removeTagRow:function(A,){Roo.log('removeTagRow');A.destroy();this.tagRows.splice(this.tagRows.indexOf(A),1);this.showHideRemoveBtn();},showHideRemoveBtn:function(){var A=this;Roo.each(this.tagRows,function(r){r.removeBtn.show();if(A.tagRows.length<=A.minimumRow||r.inputCb.getRawValue()==''){r.removeBtn.hide();
+}});},getValue:function(){var A=this;var B=[];Roo.each(A.tagRows,function(r){var C=r.inputCb.getRawValue();if(C!=''){var D={};D[A.valueField]=r.inputCb.getRawValue();B.push(D);}});return JSON.stringify(B);},setValue:function(A){var B=this.tagRows.length;for(var i=0;
+i<B;i++){this.removeTagRow(this.tagRows[0]);}var C=[];try{C=JSON.parse(A);}catch{}Roo.log(C);for(var i=0;i<C.length;i++){this.addTagRow();this.tagRows[i].inputCb.setRawValue(C[i][this.valueField]);}this.addTagRow();while(this.tagRows.length<this.minimumRow){this.addTagRow();
+}},getChildContainer:function(){return Roo.select('.roo-multi-line-tag-container',true).elements[0];}});
 // Roo/data/SortTypes.js
 Roo.data.SortTypes={none:function(s){return s;},stripTagsRE:/<\/?[^>]+>/gi,asText:function(s){return String(s).replace(this.stripTagsRE,"");},asUCText:function(s){return String(s).toUpperCase().replace(this.stripTagsRE,"");},asUCString:function(s){return String(s).toUpperCase();
 },asDate:function(s){if(!s){return 0;}if(s instanceof Date){return s.getTime();}return Date.parse(String(s));},asFloat:function(s){var A=parseFloat(String(s).replace(/,/g,""));if(isNaN(A)){A=0;}return A;},asInt:function(s){var A=parseInt(String(s).replace(/,/g,""));