You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2007/09/04 19:35:06 UTC
svn commit: r572747 - in
/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs:
NumberConverter.js NumberFormat.js
Author: matzew
Date: Tue Sep 4 10:35:05 2007
New Revision: 572747
URL: http://svn.apache.org/viewvc?rev=572747&view=rev
Log:
merged previous commits to 1.2.2 branch to trunk. Added a TODO, to the code
Modified:
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js?rev=572747&r1=572746&r2=572747&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js Tue Sep 4 10:35:05 2007
@@ -219,7 +219,24 @@
{
try
{
+ //TODO matzew - see TRINIDAD-682
+ // Remove the thousands separator - which Javascript doesn't want to see
+ var groupingSeparator = getLocaleSymbols().getGroupingSeparator();
+ var grouping = new RegExp("\\" + groupingSeparator, "g");
+ numberString = numberString.replace(grouping, "");
+
+ // Then change the decimal separator into a period, the only
+ // decimal separator allowed by JS
+ var decimalSeparator = getLocaleSymbols().getDecimalSeparator()
+ var decimal = new RegExp("\\" + decimalSeparator, "g");
+ numberString = numberString.replace(decimal, ".");
+
+ //parse the numberString
numberString = this._numberFormat.parse(numberString)+"";
+
+ //to be able to pass the _decimalParse, we replace the decimal separator...
+ var jsSeparator = new RegExp("\\" + ".", "g");
+ numberString = numberString.replace(jsSeparator, decimalSeparator);
}
catch(e)
{
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js?rev=572747&r1=572746&r2=572747&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js Tue Sep 4 10:35:05 2007
@@ -312,8 +312,7 @@
number = (number*-1);
var numberString = number + "";
- var decimalSeparator = getLocaleSymbols().getDecimalSeparator();
- var index = numberString.indexOf(decimalSeparator);
+ var index = numberString.indexOf(".");
var numberStringLength = numberString.length;
var ints;
var fracs;
@@ -331,7 +330,8 @@
ints = this._formatIntegers(ints);
fracs = this._formatFractions(fracs)
-
+ var decimalSeparator = getLocaleSymbols().getDecimalSeparator();
+
if(fracs!="")
numberString = (ints+decimalSeparator+fracs);
else