roojs-bootstrap.js

roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 35905bf..e1faeda 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -8063,8 +8063,6 @@ clientValidation  Boolean          Applies to submit only.  Pass true to call fo
            f.clearInvalid();
         });
 
-
-
         return this;
     },
 
@@ -33192,7 +33190,9 @@ Roo.extend(Roo.bootstrap.NumberField, Roo.bootstrap.Input, {
             
             this.hiddenEl().dom.value = (v === null || v === undefined ? '' : v);
             
-            this.inputEl().dom.value = (this.thousandsDelimiter ? Roo.util.Format.number(v, this.decimalPrecision) : v);
+            var delimiter = (this.thousandsDelimiter) ? this.thousandsDelimiter : ',';
+            
+            this.inputEl().dom.value = (this.thousandsDelimiter ? Roo.util.Format.number(v, this.decimalPrecision, delimiter) : v);
             
             this.validate();
         }

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 0662d22..f6602b2 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1392,7 +1392,7 @@ return;}if(!Roo.isIE&&(e.isSpecialKey()||k==e.BACKSPACE||k==e.DELETE)){return;}i
 }var B=this.parseValue(A);if(isNaN(B)){this.markInvalid(String.format(this.nanText,A));return false;}if(B<this.minValue){this.markInvalid(String.format(this.minText,this.minValue));return false;}if(B>this.maxValue){this.markInvalid(String.format(this.maxText,this.maxValue));
 return false;}return true;},getValue:function(){var v=this.hiddenEl().getValue();return this.fixPrecision(this.parseValue(v));},parseValue:function(A){if(this.thousandsDelimiter){A+="";r=new RegExp(",","g");A=A.replace(r,"");}A=parseFloat(String(A).replace(this.decimalSeparator,"."));
 return isNaN(A)?'':A;},fixPrecision:function(A){if(this.thousandsDelimiter){A+="";r=new RegExp(",","g");A=A.replace(r,"");}var B=isNaN(A);if(!this.allowDecimals||this.decimalPrecision==-1||B||!A){return B?'':A;}return parseFloat(A).toFixed(this.decimalPrecision);
-},setValue:function(v){v=String(this.fixPrecision(v)).replace(".",this.decimalSeparator);this.value=v;if(this.rendered){this.hiddenEl().dom.value=(v===null||v===undefined?'':v);this.inputEl().dom.value=(this.thousandsDelimiter?Roo.util.Format.number(v,this.decimalPrecision):v);
+},setValue:function(v){v=String(this.fixPrecision(v)).replace(".",this.decimalSeparator);this.value=v;if(this.rendered){this.hiddenEl().dom.value=(v===null||v===undefined?'':v);var A=(this.thousandsDelimiter)?this.thousandsDelimiter:',';this.inputEl().dom.value=(this.thousandsDelimiter?Roo.util.Format.number(v,this.decimalPrecision,A):v);
 this.validate();}},decimalPrecisionFcn:function(v){return Math.floor(v);},beforeBlur:function(){if(!this.castInt){return;}var v=this.parseValue(this.getRawValue());if(v){this.setValue(v);}},hiddenEl:function(){return this.el.select('input.hidden-number-input',true).first();
 }});
 // Roo/bootstrap/DocumentSlider.js