Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions format-google-calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ var formatGoogleCalendar = (function() {
summary = result.summary || '',
description = result.description || '',
location = result.location || '',
dateStart_url = (result.start.dateTime || result.start.date).replace(/[-]/g,'').replace('05:00','').replace(/[:]/g,''),
dateEnd_url = (result.end.dateTime || result.end.date).replace(/[-]/g,'').replace('05:00','').replace(/[:]/g,''),
htmlLink = 'https://calendar.google.com/calendar/event?action=TEMPLATE&hl=en&ctz=America%2FChicago&text=' + encodeURIComponent(summary) + '&dates=' + encodeURIComponent(dateStart_url+'/'+dateEnd_url) + '&location=' + encodeURIComponent(location) + '&details=' + encodeURIComponent(description),
i;

for (i = 0; i < format.length; i++) {
Expand All @@ -162,11 +165,14 @@ var formatGoogleCalendar = (function() {
output = output.concat('<span class="description">' + description + '</span>');
} else if (format[i] === '*location*') {
output = output.concat('<span class="location">' + location + '</span>');
} else if (format[i] === '*htmlLink*') {
output = output.concat('<a href=' + htmlLink + '>Add to Your Calendar!</a>');
} else {
if ((format[i + 1] === '*location*' && location !== '') ||
(format[i + 1] === '*summary*' && summary !== '') ||
(format[i + 1] === '*date*' && dateFormatted !== '') ||
(format[i + 1] === '*description*' && description !== '')) {
(format[i + 1] === '*description*' && description !== '') ||
(format[i + 1] === '*htmlLink*' && htmlLink !== '')) {

output = output.concat(format[i]);
}
Expand Down Expand Up @@ -225,7 +231,7 @@ var formatGoogleCalendar = (function() {
date.setTime(date.getTime() + 86400000);
return getDateInfo(date);
};

//Subtract one day
var subtractOneDay = function (dateInfo) {
var date = getDateFormatted(dateInfo);
Expand Down Expand Up @@ -304,7 +310,7 @@ var formatGoogleCalendar = (function() {
};

//Check differences between dates and format them
var getFormattedDate = function(dateStart, dateEnd, moreDaysEvent, isAllDayEvent, dayNames) {
var getFormattedDate = function(dateStart, dateEnd, moreDaysEvent, isAllDayEvent, dayNames, htmlLink) {
var formattedDate = '';

if (dateStart[0] === dateEnd[0]) {
Expand Down Expand Up @@ -346,6 +352,7 @@ var formatGoogleCalendar = (function() {
}

return formattedDate;
return htmlLink;
};

var getFormattedTime = function (date) {
Expand Down Expand Up @@ -392,7 +399,7 @@ var formatGoogleCalendar = (function() {
pastSelector: '#events-past',
upcomingHeading: '<h2>Upcoming events</h2>',
pastHeading: '<h2>Past events</h2>',
format: ['*date*', ': ', '*summary*', ' &mdash; ', '*description*', ' in ', '*location*']
format: ['*date*', ': ', '*summary*', ' &mdash; ', '*description*', ' in ', '*location*', '</br>', '*htmlLink*']
};

settings = mergeOptions(settings, settingsOverride);
Expand Down