You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gc...@apache.org on 2013/02/21 20:39:29 UTC
svn commit: r1448782 - in
/myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs:
NumberConverter.js NumberFormat.js
Author: gcrawford
Date: Thu Feb 21 19:39:29 2013
New Revision: 1448782
URL: http://svn.apache.org/r1448782
Log:
TRINIDAD-2354 convertNumber type=percent server and client results differ.
Thanks to yee-wah
Modified:
myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js
myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js?rev=1448782&r1=1448781&r2=1448782&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js Thu Feb 21 19:39:29 2013
@@ -268,7 +268,12 @@ TrNumberConverter.prototype.getAsObject
// throw a converter exception.
try
{
- numberString = TrNumberFormat.getNumberInstance().parse(numberString)+"";
+ var nf = TrNumberFormat.getNumberInstance();
+ nf.setMinimumIntegerDigits (this._minIntegerDigits);
+ nf.setMaximumIntegerDigits (this._maxIntegerDigits);
+ nf.setMinimumFractionDigits (this._minFractionDigits);
+ nf.setMaximumFractionDigits (this._maxFractionDigits);
+ numberString = nf.parse(numberString)+"";
}
catch (e)
{
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js?rev=1448782&r1=1448781&r2=1448782&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js Thu Feb 21 19:39:29 2013
@@ -33,7 +33,10 @@
this._nSuf = this._localeSymbols.getNegativeSuffix();
//default values, similar to JDK (values from Apache Harmony)
- this._maxFractionDigits = 3;
+ if(this._type=="percent")
+ this._maxFractionDigits = 0;
+ else
+ this._maxFractionDigits = 3;
this._maxIntegerDigits = 40;
if(this._type=="currency")
{