roojs-bootstrap.js

roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index fbc6a61..2976c88 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -39816,8 +39816,14 @@ Roo.extend(Roo.bootstrap.MoneyField, Roo.bootstrap.TriggerField, {
                     autocomplete: 'new-password'
                 },
                 {
-                    tag: 'div',
-                    cls: 'caret'
+                    tag: 'span',
+                    cls: 'input-group-addon btn dropdown-toggle',
+                    cn : [
+                        {
+                            tag : 'span',
+                            cls : 'caret'
+                        }
+                    ]
                 }
             ]
         };

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 596f7f3..472320e 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1634,8 +1634,8 @@ for(var i=1;i<v.length;i++){var c=v.charAt(i);if(!isNaN(c)){B+=c;if(this.dialCod
 // Roo/bootstrap/MoneyField.js
 Roo.bootstrap.MoneyField=function(A){Roo.bootstrap.MoneyField.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.MoneyField,Roo.bootstrap.TriggerField,{getAutoCreate:function(){var A=this.labelAlign||this.parentLabelAlign();var id=Roo.id();var B={cls:'form-group',cn:[]}
 ;var C={tag:'input',id:id,cls:'form-control roo-money-amount-input',autocomplete:'new-password'};if(this.name){C.name=this.name;}if(this.disabled){C.disabled=true;}var D={tag:'div',cls:'currency-box',cn:[{tag:'input',cls:'form-control roo-money-currency-input',autocomplete:'new-password'}
-,{tag:'div',cls:'caret'}]};var E={tag:'div',cls:this.hasFeedback?'has-feedback':'',cn:[C]};var F={cls:'roo-select2-container input-group',cn:[D,E]};if(this.fieldLabel.length){var G={tag:'i',tooltip:'This field is required'};var H={tag:'label','for':id,cls:'control-label',cn:[]}
-;var I={tag:'span',html:this.fieldLabel};G.cls='roo-required-indicator text-danger fa fa-lg fa-star left-indicator';H.cn=[G,I];if(this.indicatorpos=='right'){G.cls='roo-required-indicator text-danger fa fa-lg fa-star right-indicator';H.cn=[I,G];}if(A=='left'){F={tag:'div',cn:[F]}
-;if(this.labelWidth>12){H.style="width: "+this.labelWidth+'px';}if(this.labelWidth<13&&this.labelmd==0){this.labelmd=this.labelWidth;}if(this.labellg>0){H.cls+=' col-lg-'+this.labellg;C.cls+=' col-lg-'+(12-this.labellg);}if(this.labelmd>0){H.cls+=' col-md-'+this.labelmd;
-F.cls+=' col-md-'+(12-this.labelmd);}if(this.labelsm>0){H.cls+=' col-sm-'+this.labelsm;F.cls+=' col-sm-'+(12-this.labelsm);}if(this.labelxs>0){H.cls+=' col-xs-'+this.labelxs;F.cls+=' col-xs-'+(12-this.labelxs);}}}B.cn=[H,F];var J=this;['xs','sm','md','lg'].map(function(K){if(J[K]){B.cls+=' col-'+K+'-'+J[K];
-}});return B;},initEvents:function(){}});
+,{tag:'span',cls:'input-group-addon btn dropdown-toggle',cn:[{tag:'span',cls:'caret'}]}]};var E={tag:'div',cls:this.hasFeedback?'has-feedback':'',cn:[C]};var F={cls:'roo-select2-container input-group',cn:[D,E]};if(this.fieldLabel.length){var G={tag:'i',tooltip:'This field is required'}
+;var H={tag:'label','for':id,cls:'control-label',cn:[]};var I={tag:'span',html:this.fieldLabel};G.cls='roo-required-indicator text-danger fa fa-lg fa-star left-indicator';H.cn=[G,I];if(this.indicatorpos=='right'){G.cls='roo-required-indicator text-danger fa fa-lg fa-star right-indicator';
+H.cn=[I,G];}if(A=='left'){F={tag:'div',cn:[F]};if(this.labelWidth>12){H.style="width: "+this.labelWidth+'px';}if(this.labelWidth<13&&this.labelmd==0){this.labelmd=this.labelWidth;}if(this.labellg>0){H.cls+=' col-lg-'+this.labellg;C.cls+=' col-lg-'+(12-this.labellg);
+}if(this.labelmd>0){H.cls+=' col-md-'+this.labelmd;F.cls+=' col-md-'+(12-this.labelmd);}if(this.labelsm>0){H.cls+=' col-sm-'+this.labelsm;F.cls+=' col-sm-'+(12-this.labelsm);}if(this.labelxs>0){H.cls+=' col-xs-'+this.labelxs;F.cls+=' col-xs-'+(12-this.labelxs);
+}}}B.cn=[H,F];var J=this;['xs','sm','md','lg'].map(function(K){if(J[K]){B.cls+=' col-'+K+'-'+J[K];}});return B;},initEvents:function(){}});