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/09 11:47:00 UTC
svn commit: r564158 - in
/myfaces/trinidad/tags/trinidad-1.0.2/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs:
CoreFormat.js NumberFormat.js
Author: matzew
Date: Thu Aug 9 02:46:59 2007
New Revision: 564158
URL: http://svn.apache.org/viewvc?view=rev&rev=564158
Log:
merged recent Trinidad fixes to RELEASE_TAG, to ensure, these fixes are available in the upcoming 102 core release!
Modified:
myfaces/trinidad/tags/trinidad-1.0.2/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js
myfaces/trinidad/tags/trinidad-1.0.2/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js
Modified: myfaces/trinidad/tags/trinidad-1.0.2/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/tags/trinidad-1.0.2/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js?view=diff&rev=564158&r1=564157&r2=564158
==============================================================================
--- myfaces/trinidad/tags/trinidad-1.0.2/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js (original)
+++ myfaces/trinidad/tags/trinidad-1.0.2/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js Thu Aug 9 02:46:59 2007
@@ -723,14 +723,16 @@
var allWeekdays = ['mon','tue','wed','thu','fri','sat','sun'];
var allMonth = ['jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec'];
- //remove the submitted values, which are invalid, to display only the valid ones
- TrCollections.removeValuesFromArray(this._weekdaysValue, allWeekdays);
+ //if needed, remove the submitted values, which are invalid, to display only the valid ones
+ if(this._weekdaysValue)
+ TrCollections.removeValuesFromArray(this._weekdaysValue, allWeekdays);
+ if(this._monthValue)
TrCollections.removeValuesFromArray(this._monthValue, allMonth);
return _returnHints(
this._messages,
- this._translate(allWeekdays, this._translatedWeekdaysMap, converter.getLocaleSymbols().getWeekdays()),
- this._translate(allMonth, this._translatedMonthMap, converter.getLocaleSymbols().getMonths()),
+ !this._weekdaysValue ? this._weekdaysValue : this._translate(allWeekdays, this._translatedWeekdaysMap, converter.getLocaleSymbols().getWeekdays()),
+ !this._monthValue ? this._monthValue : this._translate(allMonth, this._translatedMonthMap, converter.getLocaleSymbols().getMonths()),
"org.apache.myfaces.trinidad.validator.DateRestrictionValidator.WEEKDAY_HINT",
"org.apache.myfaces.trinidad.validator.DateRestrictionValidator.MONTH_HINT",
"hintWeek",
Modified: myfaces/trinidad/tags/trinidad-1.0.2/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/tags/trinidad-1.0.2/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js?view=diff&rev=564158&r1=564157&r2=564158
==============================================================================
--- myfaces/trinidad/tags/trinidad-1.0.2/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js (original)
+++ myfaces/trinidad/tags/trinidad-1.0.2/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js Thu Aug 9 02:46:59 2007
@@ -554,7 +554,7 @@
{
formatted += groupingSeparator;
}
- formatted += toFormat[i];
+ formatted += toFormat.charAt(i);
}
ints = balance + formatted;
return ints;