svn commit: r790529 - /myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/DateFormat.js

[ma...@apache.org]

Author: matzew
Date: Thu Jul  2 09:59:30 2009
New Revision: 790529

URL: http://svn.apache.org/viewvc?rev=790529&view=rev
Log:
porting rev 789793 to tmp branch

Modified:
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/DateFormat.js

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/DateFormat.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/DateFormat.js?rev=790529&r1=790528&r2=790529&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/DateFormat.js (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/DateFormat.js Thu Jul  2 09:59:30 2009
@@ -1155,7 +1155,15 @@
 
   parseString = TrUIUtils.trim(parseString);
   if (parseString.length == 0)
-    return null
+    return null;
+
+  // the following correct parseString "24.12.2009 16:36 Uhr"
+  // causes an error, as the pattern wants an extra empty sting
+  // at the end...
+  if(this._endsWith(parseString, "Uhr"))
+  {
+    parseString += " ";
+  }
 
   var pattern = this._pattern;
   
@@ -1206,6 +1214,17 @@
   }
 }
 
+TrDateTimeConverter.prototype._endsWith = function(
+  value,
+  suffix
+  )
+{
+  // TODO: add to a String utils class ?
+  var startPos = value.length - suffix.length;
+  if (startPos < 0)
+    return false;
+  return (value.lastIndexOf(suffix, startPos) == startPos);
+}
 
 TrDateTimeConverter.prototype._initPatterns  = function(
   pattern, locale)