You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2007/01/18 11:38:41 UTC
svn commit: r497407 -
/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js
Author: matzew
Date: Thu Jan 18 03:38:38 2007
New Revision: 497407
URL: http://svn.apache.org/viewvc?view=rev&rev=497407
Log:
removed not needed code
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js?view=diff&rev=497407&r1=497406&r2=497407
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js Thu Jan 18 03:38:38 2007
@@ -545,7 +545,7 @@
return _returnRangeHints(
this._messages,
converter.getAsString(new Date(this._maxValue)),
- converter.getAsString(new Date(this._minValue)),
+ null,//converter.getAsString(new Date(this._minValue)),
"org.apache.myfaces.trinidad.validator.DateTimeRangeValidator.MAXIMUM_HINT",
"org.apache.myfaces.trinidad.validator.DateTimeRangeValidator.MINIMUM_HINT",
"org.apache.myfaces.trinidad.validator.DateTimeRangeValidator.RANGE_HINT",
@@ -983,11 +983,11 @@
rangeHint
)
{
- var hints;
+
//we have both, max and min, so we only use the range Hint
if(max && min)
{
- hints = new Array();
+ var hints = new Array();
if(messages && messages[rangeHint])
{
hints.push(
@@ -1009,52 +1009,16 @@
return hints;
}
- //only max
- if(max)
- {
- hints = new Array();
- if(messages && messages[maxHint])
- {
- hints.push(
- TrMessageFactory.createCustomMessage(
- messages[maxHint],
- ""+max)
- );
- }
- else
- {
- hints.push(
- TrMessageFactory.createMessage(
- maxKey,
- ""+max)
- );
- }
- }
- //only min
- if(min)
- {
- if(!hints)
- {
- hints = new Array();
- }
- if(messages && messages[minHint])
- {
- hints.push(
- TrMessageFactory.createCustomMessage(
- messages[minHint],
- ""+min)
- );
- }
- else
- {
- hints.push(
- TrMessageFactory.createMessage(
- minKey,
- ""+min)
- );
- }
- }
- return hints;
+ return _returnHints(
+ messages,
+ max,
+ min,
+ maxKey,
+ minKey,
+ maxHint,
+ minHint
+ );
+
}
function _returnHints(
messages,