mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-13 19:41:49 +00:00
Fixing bug 163925.
This commit is contained in:
parent
2d5e472506
commit
98438361a1
@ -923,7 +923,7 @@ function makeXmlNode( xmlDocument, calendarEvent )
|
||||
ruleText = eventText.substring(i+8);
|
||||
ruleText = ruleText.substring(0, ruleText.indexOf("\n"));
|
||||
}
|
||||
if( ruleText.length > 0)
|
||||
if( ruleText && ruleText.length > 0)
|
||||
{
|
||||
var propertyNode = xmlDocument.createElement( "property" );
|
||||
propertyNode.setAttribute( "name", "RRULE" );
|
||||
@ -965,20 +965,33 @@ function makeXmlNode( xmlDocument, calendarEvent )
|
||||
|
||||
// create a string in the iCalendar format, UTC time '20020412T121314Z'
|
||||
var checkDate = function ( dt, isDate )
|
||||
{ var dateObj = new Date( dt.getTime() );
|
||||
{
|
||||
var dateObj = new Date( dt.getTime() );
|
||||
var result = "";
|
||||
result += dateObj.getUTCFullYear();
|
||||
|
||||
if( dateObj.getMonth() + 1 < 10 )
|
||||
result += "0";
|
||||
result += dateObj.getUTCMonth() + 1;
|
||||
|
||||
if( dateObj.getUTCDate() < 10 )
|
||||
result += "0";
|
||||
result += dateObj.getUTCDate();
|
||||
|
||||
if( !isDate )
|
||||
if( isDate )
|
||||
{
|
||||
result += dateObj.getFullYear();
|
||||
if( dateObj.getMonth() + 1 < 10 )
|
||||
result += "0";
|
||||
result += dateObj.getMonth() + 1;
|
||||
|
||||
if( dateObj.getDate() < 10 )
|
||||
result += "0";
|
||||
result += dateObj.getDate();
|
||||
}
|
||||
else
|
||||
{
|
||||
result += dateObj.getUTCFullYear();
|
||||
|
||||
if( dateObj.getUTCMonth() + 1 < 10 )
|
||||
result += "0";
|
||||
result += dateObj.getUTCMonth() + 1;
|
||||
|
||||
if( dateObj.getUTCDate() < 10 )
|
||||
result += "0";
|
||||
result += dateObj.getUTCDate();
|
||||
|
||||
result += "T"
|
||||
|
||||
if( dateObj.getUTCHours() < 10 )
|
||||
@ -994,7 +1007,8 @@ function makeXmlNode( xmlDocument, calendarEvent )
|
||||
result += dateObj.getUTCSeconds();
|
||||
result += "Z";
|
||||
}
|
||||
return result;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
// make the event tag
|
||||
|
@ -923,7 +923,7 @@ function makeXmlNode( xmlDocument, calendarEvent )
|
||||
ruleText = eventText.substring(i+8);
|
||||
ruleText = ruleText.substring(0, ruleText.indexOf("\n"));
|
||||
}
|
||||
if( ruleText.length > 0)
|
||||
if( ruleText && ruleText.length > 0)
|
||||
{
|
||||
var propertyNode = xmlDocument.createElement( "property" );
|
||||
propertyNode.setAttribute( "name", "RRULE" );
|
||||
@ -965,20 +965,33 @@ function makeXmlNode( xmlDocument, calendarEvent )
|
||||
|
||||
// create a string in the iCalendar format, UTC time '20020412T121314Z'
|
||||
var checkDate = function ( dt, isDate )
|
||||
{ var dateObj = new Date( dt.getTime() );
|
||||
{
|
||||
var dateObj = new Date( dt.getTime() );
|
||||
var result = "";
|
||||
result += dateObj.getUTCFullYear();
|
||||
|
||||
if( dateObj.getMonth() + 1 < 10 )
|
||||
result += "0";
|
||||
result += dateObj.getUTCMonth() + 1;
|
||||
|
||||
if( dateObj.getUTCDate() < 10 )
|
||||
result += "0";
|
||||
result += dateObj.getUTCDate();
|
||||
|
||||
if( !isDate )
|
||||
if( isDate )
|
||||
{
|
||||
result += dateObj.getFullYear();
|
||||
if( dateObj.getMonth() + 1 < 10 )
|
||||
result += "0";
|
||||
result += dateObj.getMonth() + 1;
|
||||
|
||||
if( dateObj.getDate() < 10 )
|
||||
result += "0";
|
||||
result += dateObj.getDate();
|
||||
}
|
||||
else
|
||||
{
|
||||
result += dateObj.getUTCFullYear();
|
||||
|
||||
if( dateObj.getUTCMonth() + 1 < 10 )
|
||||
result += "0";
|
||||
result += dateObj.getUTCMonth() + 1;
|
||||
|
||||
if( dateObj.getUTCDate() < 10 )
|
||||
result += "0";
|
||||
result += dateObj.getUTCDate();
|
||||
|
||||
result += "T"
|
||||
|
||||
if( dateObj.getUTCHours() < 10 )
|
||||
@ -994,7 +1007,8 @@ function makeXmlNode( xmlDocument, calendarEvent )
|
||||
result += dateObj.getUTCSeconds();
|
||||
result += "Z";
|
||||
}
|
||||
return result;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
// make the event tag
|
||||
|
Loading…
x
Reference in New Issue
Block a user