Roo/util/Format.js

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

diff --git a/Roo/util/Format.js b/Roo/util/Format.js
index 161ff4e..b23185b 100644 (file)
--- a/Roo/util/Format.js
+++ b/Roo/util/Format.js
@@ -177,6 +177,8 @@ Roo.util.Format = function(){
         {
             // multiply and round.
             decimals = typeof(decimals) == 'undefined' ? 2 : decimals;
+            thousandsDelimiter = typeof(thousandsDelimiter) == 'undefined' ? ',' : thousandsDelimiter;
+            
             var mul = Math.pow(10, decimals);
             var zero = String(mul).substring(1);
             v = (Math.round((v-0)*mul))/mul;

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index e77874c..9b5c1e5 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -33190,10 +33190,6 @@ Roo.extend(Roo.bootstrap.NumberField, Roo.bootstrap.Input, {
             
             this.hiddenEl().dom.value = (v === null || v === undefined ? '' : v);
             
-            var delimiter = (this.thousandsDelimiter) ? this.thousandsDelimiter : ',';
-            
-            // this.inputEl().dom.value = (this.thousandsDelimiter ? Roo.util.Format.number(v, this.decimalPrecision, delimiter) : v);
-            
             this.inputEl().dom.value = Roo.util.Format.number(v, this.decimalPrecision, this.thousandsDelimiter ? this.thousandsDelimiter : '');
             
             this.validate();

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 901ae9e..f176e4d 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);var A=(this.thousandsDelimiter)?this.thousandsDelimiter:',';this.inputEl().dom.value=Roo.util.Format.number(v,this.decimalPrecision,this.thousandsDelimiter?this.thousandsDelimiter:'');
+},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=Roo.util.Format.number(v,this.decimalPrecision,this.thousandsDelimiter?this.thousandsDelimiter:'');
 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