Commit 179d1ef3 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

при распознавании времени результирующий формат зависит от наличия AM/PM

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50281 954022d7-b5bf-4e40-9824-e11837661b57
parent b981a2e8
...@@ -2634,10 +2634,15 @@ FormatParser.prototype = ...@@ -2634,10 +2634,15 @@ FormatParser.prototype =
sFormat = "m/d/yyyy h:mm:ss AM/PM"; sFormat = "m/d/yyyy h:mm:ss AM/PM";
else if(true == bDate) else if(true == bDate)
sFormat = "m/d/yyyy"; sFormat = "m/d/yyyy";
else if(dValue > 1)
sFormat = "[hh]:mm:ss";
else else
sFormat = "h:mm:ss AM/PM"; {
if(dValue > 1)
sFormat = "[h]:mm:ss";
else if(null != ampm)
sFormat = "h:mm:ss AM/PM";
else
sFormat = "h:mm:ss";
}
res = {format: sFormat, value: dValue, bDateTime: true}; res = {format: sFormat, value: dValue, bDateTime: true};
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment