[richfaces-svn-commits] JBoss Rich Faces SVN: r4811 - branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts.

[richfaces-svn-commits at lists.jboss.org]

Author: pyaschenko
Date: 2007-12-13 08:48:28 -0500 (Thu, 13 Dec 2007)
New Revision: 4811

Modified:
   branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
Log:
RF-1621

Modified: branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js	2007-12-13 13:42:01 UTC (rev 4810)
+++ branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js	2007-12-13 13:48:28 UTC (rev 4811)
@@ -315,8 +315,27 @@
 
 Richfaces.Calendar.parseDate = function(dateString, pattern, monthNames, monthNamesShort)
 {
-	if (!monthNames) monthNames = Richfaces.Calendar.getDefaultMonthNames();
-	if (!monthNamesShort) monthNamesShort = Richfaces.Calendar.getDefaultMonthNames(true);
+	var re = /([.*+?^<>=!:${}()[\]\/\\])/g;
+	var monthNamesStr
+	var monthNamesShortStr;
+	if (!monthNames)
+	{
+		monthNames = Richfaces.Calendar.getDefaultMonthNames();
+		monthNamesStr = monthNames.join('|');
+	}
+	else
+	{
+		monthNamesStr = monthNames.join('|').replace(re, '\\$1');
+	}
+	if (!monthNamesShort)
+	{
+		monthNamesShort = Richfaces.Calendar.getDefaultMonthNames(true);
+		monthNamesShortStr = monthNamesShort.join('|');
+	}
+	else
+	{
+		monthNamesShortStr = monthNamesShort.join('|').replace(re, '\\$1');
+	}
 	
 	var counter=1;
 	var y,m,d;
@@ -332,7 +351,7 @@
 	            case 'MM' : m=counter; counter++; return '(\\d{2})';
 	            case 'M'  : m=counter; counter++; return '(\\d{1,2})';
 	            case 'd'  : d=counter; counter++; return '(\\d{1,2})';
-	            case 'MMM': m=counter; counter++; shortLabel=true; return '('+monthNamesShort.join('|')+')';
+	            case 'MMM': m=counter; counter++; shortLabel=true; return '('+monthNamesShortStr+')';
 	            case 'a'  : a=counter; counter++; return '(AM|am|PM|pm)?';
 	            case 'HH' :
 	            case 'hh' : h=counter; counter++; return '(\\d{2})?';
@@ -343,7 +362,7 @@
 	        // y+,M+,d+
 			var ch = $1.charAt(0);
 			if (ch=='y') {y=counter; counter++; return '(\\d{4})'};
-			if (ch=='M') {m=counter; counter++; return '('+monthNames.join('|')+')'};
+			if (ch=='M') {m=counter; counter++; return '('+monthNamesStr+')'};
 			if (ch=='d') {d=counter; counter++; return '(\\d{2})'};
 		}
 	);