Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
lib-ical
Commits
f4518585
Commit
f4518585
authored
Dec 08, 2015
by
Sebastian
Browse files
Merge branch 'takkaria-optional-end-date' into develop
parents
8dbe43f8
955a95b3
Changes
3
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
f4518585
...
...
@@ -281,7 +281,7 @@ Appointment date of beginning as Date object. This is required for all events!
#### end([_Date_ end])
Appointment date of end as Date object.
This is also required for all events!
Appointment date of end as Date object.
#### timestamp([_Date_ stamp]) or stamp([_Date_ stamp])
...
...
lib/event.js
View file @
f4518585
...
...
@@ -562,9 +562,6 @@ var ICalEvent = function(_data) {
if
(
!
data
.
start
)
{
throw
'
No value for `start` in ICalEvent #
'
+
data
.
id
+
'
given!
'
;
}
if
(
!
data
.
end
)
{
throw
'
No value for `end` in ICalEvent #
'
+
data
.
id
+
'
given!
'
;
}
// DATE & TIME
g
+=
'
BEGIN:VEVENT
\r\n
'
;
...
...
@@ -572,10 +569,14 @@ var ICalEvent = function(_data) {
g
+=
'
DTSTAMP:
'
+
tools
.
formatDate
(
data
.
stamp
)
+
'
\r\n
'
;
if
(
data
.
allDay
)
{
g
+=
'
DTSTART;VALUE=DATE:
'
+
tools
.
formatDate
(
data
.
start
,
true
)
+
'
\r\n
'
;
g
+=
'
DTEND;VALUE=DATE:
'
+
tools
.
formatDate
(
data
.
end
,
true
)
+
'
\r\n
'
;
if
(
data
.
end
)
{
g
+=
'
DTEND;VALUE=DATE:
'
+
tools
.
formatDate
(
data
.
end
,
true
)
+
'
\r\n
'
;
}
}
else
{
g
+=
'
DTSTART:
'
+
tools
.
formatDate
(
data
.
start
,
false
,
data
.
floating
)
+
'
\r\n
'
;
g
+=
'
DTEND:
'
+
tools
.
formatDate
(
data
.
end
,
false
,
data
.
floating
)
+
'
\r\n
'
;
if
(
data
.
end
)
{
g
+=
'
DTEND:
'
+
tools
.
formatDate
(
data
.
end
,
false
,
data
.
floating
)
+
'
\r\n
'
;
}
}
// REPEATING
...
...
test/test_0.2.x.js
View file @
f4518585
...
...
@@ -257,17 +257,13 @@ describe('ical-generator 0.2.x / ICalCalendar', function() {
});
it
(
'
should throw error when event invalid
'
,
function
()
{
var
cal
=
ical
(),
var
file
=
path
.
join
(
__dirname
,
'
save.ical
'
),
cal
=
ical
(),
e
=
cal
.
createEvent
();
assert
.
throws
(
function
()
{
cal
.
save
();
cal
.
save
(
file
);
},
/`start`/
);
e
.
start
(
new
Date
());
assert
.
throws
(
function
()
{
cal
.
save
();
},
/`end`/
);
});
});
...
...
@@ -287,19 +283,14 @@ describe('ical-generator 0.2.x / ICalCalendar', function() {
});
it
(
'
should throw error when event invalid
'
,
function
()
{
var
cal
=
ical
(),
var
file
=
path
.
join
(
__dirname
,
'
save_sync.ical
'
),
cal
=
ical
(),
e
=
cal
.
createEvent
();
assert
.
throws
(
function
()
{
/*jslint stupid: true */
cal
.
saveSync
();
cal
.
saveSync
(
file
);
},
/`start`/
);
e
.
start
(
new
Date
());
assert
.
throws
(
function
()
{
/*jslint stupid: true */
cal
.
saveSync
();
},
/`end`/
);
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment