Commit e8558627 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Правка бага http://bugzserver/show_bug.cgi?id=22707

Переход на UTC время (т.к. на ubuntu учитывалось зимнее и летнее время и возникала разница при создании даты)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@53644 954022d7-b5bf-4e40-9824-e11837661b57
parent 14fa3e7f
...@@ -1013,13 +1013,13 @@ NumFormat.prototype = ...@@ -1013,13 +1013,13 @@ NumFormat.prototype =
var stDate, day, month, year, dayWeek; var stDate, day, month, year, dayWeek;
if(g_bDate1904) if(g_bDate1904)
{ {
stDate = new Date(1904,0,1,0,0,0); stDate = new Date(Date.UTC(1904,0,1,0,0,0));
if(d.val) if(d.val)
stDate.setDate( stDate.getDate() + d.val ); stDate.setUTCDate( stDate.getUTCDate() + d.val );
day = stDate.getDate(); day = stDate.getUTCDate();
dayWeek = ( stDate.getDay() > 0) ? stDate.getDay() - 1 : 6; dayWeek = ( stDate.getUTCDay() > 0) ? stDate.getUTCDay() - 1 : 6;
month = stDate.getMonth(); month = stDate.getUTCMonth();
year = stDate.getFullYear(); year = stDate.getUTCFullYear();
} }
else else
{ {
...@@ -1032,23 +1032,23 @@ NumFormat.prototype = ...@@ -1032,23 +1032,23 @@ NumFormat.prototype =
} }
else if(number < 60) else if(number < 60)
{ {
stDate = new Date(1899,11,31,0,0,0); stDate = new Date(Date.UTC(1899,11,31,0,0,0));
if(d.val) if(d.val)
stDate.setDate( stDate.getDate() + d.val ); stDate.setUTCDate( stDate.getUTCDate() + d.val );
day = stDate.getDate(); day = stDate.getUTCDate();
dayWeek = ( stDate.getDay() > 0) ? stDate.getDay() - 1 : 6; dayWeek = ( stDate.getUTCDay() > 0) ? stDate.getUTCDay() - 1 : 6;
month = stDate.getMonth(); month = stDate.getUTCMonth();
year = stDate.getFullYear(); year = stDate.getUTCFullYear();
} }
else else
{ {
stDate = new Date(1899,11,30,0,0,0); stDate = new Date(Date.UTC(1899,11,30,0,0,0));
if(d.val) if(d.val)
stDate.setDate( stDate.getDate() + d.val ); stDate.setUTCDate( stDate.getUTCDate() + d.val );
day = stDate.getDate(); day = stDate.getUTCDate();
dayWeek = stDate.getDay(); dayWeek = stDate.getUTCDay();
month = stDate.getMonth(); month = stDate.getUTCMonth();
year = stDate.getFullYear(); year = stDate.getUTCFullYear();
} }
} }
return {d: day, month: month, year: year, dayWeek: dayWeek, hour: h.val, min: min.val, sec: s.val, ms: ms.val, countDay: d.val }; return {d: day, month: month, year: year, dayWeek: dayWeek, hour: h.val, min: min.val, sec: s.val, ms: ms.val, countDay: d.val };
...@@ -2890,7 +2890,7 @@ FormatParser.prototype = ...@@ -2890,7 +2890,7 @@ FormatParser.prototype =
if(null != m && (null != d || null != y)) if(null != m && (null != d || null != y))
{ {
bDate = true; bDate = true;
var oNowDate = new Date(); var oNowDate;
if(null != d) if(null != d)
nDay = d - 0; nDay = d - 0;
else else
...@@ -2899,7 +2899,10 @@ FormatParser.prototype = ...@@ -2899,7 +2899,10 @@ FormatParser.prototype =
if(null != y) if(null != y)
nYear = y - 0; nYear = y - 0;
else else
{
oNowDate = new Date();
nYear = oNowDate.getFullYear(); nYear = oNowDate.getFullYear();
}
if(nYear < 30) if(nYear < 30)
nYear = 2000 + res.y; nYear = 2000 + res.y;
...@@ -2912,7 +2915,7 @@ FormatParser.prototype = ...@@ -2912,7 +2915,7 @@ FormatParser.prototype =
if(null != h) if(null != h)
{ {
bTime = true; bTime = true;
var nHour = h - 0; nHour = h - 0;
if(null != ampm) if(null != ampm)
{ {
if(nHour <= 23) if(nHour <= 23)
...@@ -2941,15 +2944,15 @@ FormatParser.prototype = ...@@ -2941,15 +2944,15 @@ FormatParser.prototype =
if(true == bValidDate && (true == bDate || true == bTime)) if(true == bValidDate && (true == bDate || true == bTime))
{ {
if(g_bDate1904) if(g_bDate1904)
dValue = ((new Date(nYear,nMounth,nDay,nHour,nMinute,nSecond)).getTime() - (new Date(1904,0,1,0,0,0)).getTime()) / (86400 * 1000); dValue = (Date.UTC(nYear,nMounth,nDay,nHour,nMinute,nSecond) - Date.UTC(1904,0,1,0,0,0)) / (86400 * 1000);
else else
{ {
if(1900 < nYear || (1900 == nYear && 2 < nMounth )) if(1900 < nYear || (1900 == nYear && 2 < nMounth ))
dValue = ((new Date(nYear,nMounth,nDay,nHour,nMinute,nSecond)).getTime() - (new Date(1899,11,30,0,0,0)).getTime()) / (86400 * 1000); dValue = (Date.UTC(nYear,nMounth,nDay,nHour,nMinute,nSecond) - Date.UTC(1899,11,30,0,0,0)) / (86400 * 1000);
else if(1900 == nYear && 2 == nMounth && 29 == nDay) else if(1900 == nYear && 2 == nMounth && 29 == nDay)
dValue = 60; dValue = 60;
else else
dValue = ((new Date(nYear,nMounth,nDay,nHour,nMinute,nSecond)).getTime() - (new Date(1899,11,31,0,0,0)).getTime()) / (86400 * 1000); dValue = (Date.UTC(nYear,nMounth,nDay,nHour,nMinute,nSecond) - Date.UTC(1899,11,31,0,0,0)) / (86400 * 1000);
} }
if(dValue > 0) if(dValue > 0)
{ {
......
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