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/08/01 22:59:19 UTC
svn commit: r561950 -
/myfaces/trinidad/branches/faces-1_2_1-070726/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js
Author: matzew
Date: Wed Aug 1 13:59:18 2007
New Revision: 561950
URL: http://svn.apache.org/viewvc?view=rev&rev=561950
Log:
merged missing fixes to TMP branch
Modified:
myfaces/trinidad/branches/faces-1_2_1-070726/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js
Modified: myfaces/trinidad/branches/faces-1_2_1-070726/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/faces-1_2_1-070726/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js?view=diff&rev=561950&r1=561949&r2=561950
==============================================================================
--- myfaces/trinidad/branches/faces-1_2_1-070726/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js (original)
+++ myfaces/trinidad/branches/faces-1_2_1-070726/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js Wed Aug 1 13:59:18 2007
@@ -935,14 +935,17 @@
allValues
)
{
- for(i=0; i<invalidValues.length; i++)
+ if(invalidValues)
{
- var value = invalidValues[i];
- for(j=0;j<allValues.length; j++)
+ for(i=0; i<invalidValues.length; i++)
{
- if(allValues[j].toLowerCase() == value.toLowerCase())
+ var value = invalidValues[i];
+ for(j=0;j<allValues.length; j++)
{
- allValues.splice(j,1);
+ if(allValues[j].toLowerCase() == value.toLowerCase())
+ {
+ allValues.splice(j,1);
+ }
}
}
}
@@ -1080,18 +1083,10 @@
if ((numberString.indexOf(grouping) == 0) ||
(numberString.lastIndexOf(grouping) == (numberString.length - 1)))
{
- if(message == null)
- {
- facesMessage = _createFacesMessage( standardKey+".CONVERT",
- label,
- numberString);
- }
- else
- {
- facesMessage = _createFacesMessage( standardKey+".CONVERT",
- label,
- numberString);
- }
+ facesMessage = _createFacesMessage( standardKey+".CONVERT",
+ label,
+ numberString);
+
throw new TrConverterException(facesMessage);
}