@hebcal/rest-api 4.3.5 → 4.3.7

package/dist/index.js

@@ -1,8 +1,6 @@
-/*! @hebcal/rest-api v4.3.5 */
+/*! @hebcal/rest-api v4.3.7 */
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var core = require('@hebcal/core');
 var leyning = require('@hebcal/leyning');
 var triennial = require('@hebcal/triennial');
@@ -15,7 +13,6 @@ var AD="Andorra";var AE="United Arab Emirates";var AF="Afghanistan";var AI="Angu
  * @param {Location} location
  * @return {string}
  */
-
 function locationToPlainObj(location) {
   if (typeof location === 'object' && location !== null && typeof location.name === 'string') {
     const o = {
@@ -39,6 +36,7 @@ function locationToPlainObj(location) {
     };
   }
 }
+
 /**
  * Helper function to transform a string to make it more usable in a URL or filename.
  * Converts to lowercase and replaces non-word characters with hyphen ('-').
@@ -47,25 +45,21 @@ function locationToPlainObj(location) {
  * @param {string} s
  * @return {string}
  */
-
 function makeAnchor(s) {
   return s.toLowerCase().replace(/'/g, '').replace(/[^\w]/g, '-').replace(/-+/g, '-').replace(/^-/g, '').replace(/-$/g, '');
 }
+
 /**
  * @param {CalOptions} options
  * @return {string}
  */
-
 function getDownloadFilename(options) {
   let fileName = 'hebcal';
-
   if (options.year) {
     fileName += '_' + options.year;
-
     if (options.isHebrewYear) {
       fileName += 'h';
     }
-
     if (options.month) {
       fileName += '_' + options.month;
     }
@@ -74,42 +68,37 @@ function getDownloadFilename(options) {
     const end = new core.HDate(options.end);
     const y1 = start.greg().getFullYear();
     const y2 = end.greg().getFullYear();
-
     if (y1 === y2) {
       fileName += '_' + y1;
     } else {
       fileName += '_' + y1 + '_' + y2;
     }
   }
-
   if (typeof options.location === 'object') {
     const loc = options.location;
     const name = loc.zip || loc.asciiname || loc.getShortName();
-
     if (name) {
       fileName += '_' + makeAnchor(name).replace(/[-]/g, '_');
     }
   }
-
   return fileName;
 }
+
 /**
  * @param {number} number
  * @return {string}
  */
-
 function pad2(number) {
   if (number < 10) {
     return '0' + number;
   }
-
   return '' + number;
 }
+
 /**
  * @param {number} number
  * @return {string}
  */
-
 function pad4(number) {
   if (number < 0) {
     return '-00' + pad4(-number);
@@ -120,59 +109,51 @@ function pad4(number) {
   } else if (number < 1000) {
     return '0' + number;
   }
-
   return '' + number;
 }
+
 /**
  * Returns just the date portion as YYYY-MM-DD
  * @param {Date} d
  * @return {string}
  */
-
 function toISOString(d) {
   return pad4(d.getFullYear()) + '-' + pad2(d.getMonth() + 1) + '-' + pad2(d.getDate());
 }
-const flagToCategory = [[core.flags.MAJOR_FAST, 'holiday', 'major', 'fast'], [core.flags.CHANUKAH_CANDLES, 'holiday', 'major'], [core.flags.DAF_YOMI, 'dafyomi'], [core.flags.HEBREW_DATE, 'hebdate'], [core.flags.MINOR_FAST, 'holiday', 'fast'], [core.flags.MINOR_HOLIDAY, 'holiday', 'minor'], [core.flags.MISHNA_YOMI, 'mishnayomi'], [core.flags.MODERN_HOLIDAY, 'holiday', 'modern'], [core.flags.MOLAD, 'molad'], [core.flags.OMER_COUNT, 'omer'], [core.flags.PARSHA_HASHAVUA, 'parashat'], // backwards-compat
+const flagToCategory = [[core.flags.MAJOR_FAST, 'holiday', 'major', 'fast'], [core.flags.CHANUKAH_CANDLES, 'holiday', 'major'], [core.flags.DAF_YOMI, 'dafyomi'], [core.flags.HEBREW_DATE, 'hebdate'], [core.flags.MINOR_FAST, 'holiday', 'fast'], [core.flags.MINOR_HOLIDAY, 'holiday', 'minor'], [core.flags.MISHNA_YOMI, 'mishnayomi'], [core.flags.YERUSHALMI_YOMI, 'yerushalmi'], [core.flags.MODERN_HOLIDAY, 'holiday', 'modern'], [core.flags.MOLAD, 'molad'], [core.flags.OMER_COUNT, 'omer'], [core.flags.PARSHA_HASHAVUA, 'parashat'],
+// backwards-compat
 [core.flags.ROSH_CHODESH, 'roshchodesh'], [core.flags.SHABBAT_MEVARCHIM, 'mevarchim'], [core.flags.SPECIAL_SHABBAT, 'holiday', 'shabbat'], [core.flags.USER_EVENT, 'user']];
+
 /**
  * Returns a category and subcategory name
  * @param {Event} ev
  * @return {string[]}
  */
-
 function getEventCategories(ev) {
   const desc = ev.getDesc();
-
   switch (desc) {
     // LIGHT_CANDLES or LIGHT_CANDLES_TZEIS
     case 'Candle lighting':
       return ['candles'];
     // YOM_TOV_ENDS
-
     case 'Havdalah':
       return ['havdalah'];
     // flags.MINOR_FAST or flags.MAJOR_FAST
-
     case 'Fast begins':
     case 'Fast ends':
       return ['zmanim', 'fast'];
   }
-
   if (ev.cholHaMoedDay) {
     return ['holiday', 'major', 'cholhamoed'];
   }
-
   const mask = ev.getFlags();
-
   for (let i = 0; i < flagToCategory.length; i++) {
     const attrs = flagToCategory[i];
-
     if (mask & attrs[0]) {
       return attrs.slice(1);
     }
-  } // Don't depend on flags.MINOR_HOLIDAY always being set
-
-
+  }
+  // Don't depend on flags.MINOR_HOLIDAY always being set
   switch (desc) {
     case 'Lag BaOmer':
     case 'Leil Selichot':
@@ -184,31 +165,29 @@ function getEventCategories(ev) {
     case 'Tu BiShvat':
     case 'Rosh Hashana LaBehemot':
       return ['holiday', 'minor'];
-
     default:
       return ['holiday', 'major'];
   }
 }
+
 /**
  * Renders the event title in default locale, but strips off time
  * @param {Event} ev
  * @return {string}
  */
-
 function renderTitleWithoutTime(ev) {
   return typeof ev.eventTime === 'undefined' ? ev.render() : ev.renderBrief();
 }
+
 /**
  * Generates a title like "Hebcal 2020 Israel" or "Hebcal May 1993 Providence"
  * @param {Event[]} events
  * @param {CalOptions} options
  * @return {string}
  */
-
 function getCalendarTitle(events, options) {
   let title = 'Hebcal';
   const location = options.location;
-
   if (options.yahrzeit) {
     title += ' Yahrzeits and Anniversaries';
   } else if (location && location.name) {
@@ -220,17 +199,14 @@ function getCalendarTitle(events, options) {
   } else {
     title += ' Diaspora';
   }
-
   if (options.subscribe == '1') {
     return title;
   }
-
   if (options.year && (options.isHebrewYear || events.length == 0)) {
     title += ' ' + options.year;
   } else if (events.length) {
     const start = events[0].getDate().greg();
     const end = events[events.length - 1].getDate().greg();
-
     if (start.getFullYear() != end.getFullYear()) {
       title += ' ' + start.getFullYear() + '-' + end.getFullYear();
     } else if (start.getMonth() == end.getMonth()) {
@@ -243,71 +219,62 @@ function getCalendarTitle(events, options) {
       title += ' ' + start.getFullYear();
     }
   }
-
   return title;
 }
+
 /**
  * Returns an English language description of the holiday
  * @param {Event} ev
  * @param {boolean} [firstSentence=false]
  * @return {string}
  */
-
 function getHolidayDescription(ev, firstSentence = false) {
   const str = holidayDescription[ev.getDesc()] || holidayDescription[ev.basename()] || '';
-
   if (firstSentence && str) {
     const dot = str.indexOf('.');
-
     if (dot != -1) {
       return str.substring(0, dot);
     }
   }
-
   return str;
 }
-const HOLIDAY_IGNORE_MASK = core.flags.DAF_YOMI | core.flags.OMER_COUNT | core.flags.SHABBAT_MEVARCHIM | core.flags.MOLAD | core.flags.USER_EVENT | core.flags.HEBREW_DATE;
+const HOLIDAY_IGNORE_MASK = core.flags.DAF_YOMI | core.flags.OMER_COUNT | core.flags.SHABBAT_MEVARCHIM | core.flags.MOLAD | core.flags.USER_EVENT | core.flags.HEBREW_DATE | core.flags.YERUSHALMI_YOMI;
+
 /**
  * Makes mulit-line text that summarizes Torah & Haftarah
  * @param {Event} ev
  * @param {boolean} il
  * @return {string}
  */
-
 function makeTorahMemoText(ev, il) {
   const mask = ev.getFlags();
-
   if (mask & HOLIDAY_IGNORE_MASK) {
     return '';
+  } else if (typeof ev.eventTime !== 'undefined') {
+    return '';
   }
-
   const reading = mask & core.flags.PARSHA_HASHAVUA ? leyning.getLeyningForParshaHaShavua(ev, il) : leyning.getLeyningForHoliday(ev, il);
   let memo = '';
-
   if (reading && (reading.summary || reading.haftara)) {
     if (reading.summary) {
       memo += `Torah: ${reading.summary}`;
     }
-
     if (reading.summary && reading.haftara) {
       memo += '\n';
     }
-
     if (reading.haftara) {
       memo += 'Haftarah: ' + reading.haftara;
-
       if (reading.reason && reading.reason.haftara) {
         memo += ' | ' + reading.reason.haftara;
       }
     }
   }
-
   if (reading && reading.sephardic) {
     memo += '\nHaftarah for Sephardim: ' + reading.sephardic;
   }
-
   return memo;
 }
+
 /**
  * Appends utm_source and utm_medium parameters to a URL
  * @param {string} url
@@ -317,24 +284,19 @@ function makeTorahMemoText(ev, il) {
  * @param {string} utmCampaign
  * @return {string}
  */
-
 function appendIsraelAndTracking(url, il, utmSource, utmMedium, utmCampaign) {
   const u = new URL(url);
   const isHebcal = u.host === 'www.hebcal.com';
-
   if (isHebcal) {
     if (il) {
       u.searchParams.set('i', 'on');
     }
-
     const path = u.pathname;
     const isHolidays = path.startsWith('/holidays/');
     const isSedrot = path.startsWith('/sedrot/');
     const isOmer = path.startsWith('/omer/');
-
     if (isHolidays || isSedrot || isOmer) {
       u.host = 'hebcal.com';
-
       if (isHolidays) {
         u.pathname = '/h/' + path.substring(10);
       } else if (isSedrot) {
@@ -343,51 +305,41 @@ function appendIsraelAndTracking(url, il, utmSource, utmMedium, utmCampaign) {
         // isOmer
         u.pathname = '/o/' + path.substring(6);
       }
-
       if (!utmCampaign || !(utmCampaign.startsWith('ical-') || utmCampaign.startsWith('pdf-'))) {
         if (utmSource) {
           u.searchParams.set('us', utmSource);
         }
-
         if (utmMedium) {
           u.searchParams.set('um', utmMedium);
         }
       }
-
       if (utmCampaign) {
         u.searchParams.set('uc', utmCampaign);
       }
-
       return u.toString();
     }
   }
-
   utmSource = isHebcal ? utmSource : 'hebcal.com';
-
   if (utmSource) {
     u.searchParams.set('utm_source', utmSource);
   }
-
   if (utmMedium) {
     u.searchParams.set('utm_medium', utmMedium);
   }
-
   if (utmCampaign) {
     u.searchParams.set('utm_campaign', utmCampaign);
   }
-
   return u.toString();
 }
+
 /**
  * @private
  * @param {Event} ev
  * @return {boolean}
  */
-
 function shouldRenderBrief(ev) {
   if (typeof ev.eventTime !== 'undefined') return true;
   const mask = ev.getFlags();
-
   if (mask & core.flags.HEBREW_DATE) {
     const hd = ev.getDate();
     return hd.getDate() === 1 ? false : true;
@@ -402,6 +354,7 @@ function shouldRenderBrief(ev) {
   }
 }
 
+// eslint-disable-next-line max-len
 const csvHeader = '"Subject","Start Date","Start Time","End Date","End Time","All day event","Description","Show time as","Location"';
 const CATEGORY = {
   dafyomi: 'Daf Yomi',
@@ -414,13 +367,13 @@ const CATEGORY = {
   roshchodesh: 'Jewish Holidays',
   user: 'Personal'
 };
+
 /**
  * Renders an Event as a string
  * @param {Event} e
  * @param {CalOptions} options
  * @return {string}
  */
-
 function eventToCsv(e, options) {
   const d = e.getDate().greg();
   const mday = d.getDate();
@@ -433,62 +386,51 @@ function eventToCsv(e, options) {
   let allDay = '"true"';
   const timed = Boolean(e.eventTime);
   let subj = shouldRenderBrief(e) ? e.renderBrief(options.locale) : e.render(options.locale);
-
   if (e.eventTime) {
     const timeStr = core.HebrewCalendar.reformatTimeStr(e.eventTimeStr, ' PM', options);
     endTime = startTime = `"${timeStr}"`;
     endDate = date;
     allDay = '"false"';
   }
-
   let loc = 'Jewish Holidays';
   const mask = e.getFlags();
-
   if (timed && options.location && options.location.name) {
     const locationName = options.location.name;
     const comma = locationName.indexOf(',');
     loc = comma === -1 ? locationName : locationName.substring(0, comma);
   } else if (mask & core.flags.DAF_YOMI) {
     const colon = subj.indexOf(': ');
-
     if (colon != -1) {
       loc = subj.substring(0, colon);
       subj = subj.substring(colon + 2);
     }
   } else {
     const category = CATEGORY[getEventCategories(e)[0]];
-
     if (category) {
       loc = category;
     }
   }
-
   subj = subj.replace(/,/g, '').replace(/"/g, '\'\'');
-
   if (options.appendHebrewToSubject) {
     const hebrew = e.renderBrief('he');
-
     if (hebrew) {
       subj += ` / ${hebrew}`;
     }
   }
-
   let memo0 = e.memo || getHolidayDescription(e, true);
-
   if (!memo0 && typeof e.linkedEvent !== 'undefined') {
     memo0 = e.linkedEvent.render(options.locale);
   }
-
   const memo = memo0.replace(/,/g, ';').replace(/"/g, '\'\'').replace(/\n/g, ' / ');
   const showTimeAs = timed || mask & core.flags.CHAG ? 4 : 3;
   return `"${subj}",${date},${startTime},${endDate},${endTime},${allDay},"${memo}","${showTimeAs}","${loc}"`;
 }
+
 /**
  * @param {Event[]} events
  * @param {HebcalOptions} options
  * @return {string}
  */
-
 function eventsToCsv(events, options) {
   return [csvHeader].concat(events.map(e => eventToCsv(e, options))).join('\r\n') + '\r\n';
 }
@@ -498,10 +440,10 @@ function eventsToCsv(events, options) {
  * @param {Event} ev
  * @return {string}
  */
-
 function eventIsoDate(ev) {
   return toISOString(ev.getDate().greg());
 }
+
 /**
  * Formats a list events for the classic Hebcal.com JSON API response
  * @param {Event[]} events
@@ -509,25 +451,22 @@ function eventIsoDate(ev) {
  * @param {boolean} [leyning=true]
  * @return {Object}
  */
-
-
 function eventsToClassicApi(events, options, leyning = true) {
   const result = {
     title: getCalendarTitle(events, options),
     date: new Date().toISOString()
   };
   result.location = locationToPlainObj(options.location);
-
   if (events.length) {
     result.range = {
       start: eventIsoDate(events[0]),
       end: eventIsoDate(events[events.length - 1])
     };
   }
-
   result.items = events.map(ev => eventToClassicApiObject(ev, options, leyning));
   return result;
 }
+
 /**
  * Converts a Hebcal event to a classic Hebcal.com JSON API object
  * @param {Event} ev
@@ -535,7 +474,6 @@ function eventsToClassicApi(events, options, leyning = true) {
  * @param {boolean} [leyning=true]
  * @return {Object}
  */
-
 function eventToClassicApiObject(ev, options, leyning$1 = true) {
   const timed = Boolean(ev.eventTime);
   const hd = ev.getDate();
@@ -547,63 +485,48 @@ function eventToClassicApiObject(ev, options, leyning$1 = true) {
   let title = shouldRenderBrief(ev) ? ev.renderBrief(options.locale) : ev.render(options.locale);
   const desc = ev.getDesc();
   const candles = desc === 'Havdalah' || desc === 'Candle lighting';
-
   if (candles) {
     const time = core.HebrewCalendar.reformatTimeStr(ev.eventTimeStr, 'pm', options);
     title += ': ' + time;
   }
-
   const result = {
     title: title,
     date: date
   };
-
   if (!timed) {
     result.hdate = hd.toString();
   }
-
   result.category = categories[0];
-
   if (categories.length > 1) {
     result.subcat = categories[1];
   }
-
   if (categories[0] === 'holiday' && mask & core.flags.CHAG) {
     result.yomtov = true;
   }
-
   if (title != desc) {
     result.title_orig = desc;
   }
-
   const hebrew = ev.renderBrief('he');
-
   if (hebrew) {
     result.hebrew = core.Locale.hebrewStripNikkud(hebrew);
   }
-
   if (!candles) {
     if (leyning$1) {
       const il = options.il;
       const isParsha = mask === core.flags.PARSHA_HASHAVUA;
       const reading = isParsha ? leyning.getLeyningForParshaHaShavua(ev, il) : leyning.getLeyningForHoliday(ev, il);
-
       if (reading) {
         result.leyning = formatLeyningResult(reading);
         const hyear = hd.getFullYear();
-
         if (isParsha && !il && hyear >= 5745) {
           const triReading = triennial.getTriennialForParshaHaShavua(ev);
-
           if (triReading) {
             result.leyning.triennial = formatAliyot({}, triReading.aliyot);
           }
         }
       }
     }
-
     const url = ev.url();
-
     if (url) {
       const utmSource = options.utmSource || 'js';
       const utmMedium = options.utmMedium || 'api';
@@ -611,7 +534,6 @@ function eventToClassicApiObject(ev, options, leyning$1 = true) {
       result.link = appendIsraelAndTracking(url, options.il, utmSource, utmMedium, utmCampaign);
     }
   }
-
   if (mask & core.flags.OMER_COUNT) {
     result.omer = {
       count: {
@@ -625,7 +547,6 @@ function eventToClassicApiObject(ev, options, leyning$1 = true) {
       }
     };
   }
-
   if (options.heDateParts && !timed || mask & core.flags.HEBREW_DATE) {
     const yy = hd.getFullYear();
     const mm = hd.getMonthName();
@@ -636,31 +557,26 @@ function eventToClassicApiObject(ev, options, leyning$1 = true) {
       d: core.gematriya(dd)
     };
   }
-
   const memo = ev.memo || holidayDescription[ev.basename()];
-
   if (memo) {
     result.memo = memo;
   } else if (typeof ev.linkedEvent !== 'undefined') {
     result.memo = ev.linkedEvent.render(options.locale);
   }
-
   if (options.includeEvent) {
     result.ev = ev;
   }
-
   return result;
 }
+
 /**
  * @param {Object} result
  * @param {Object} aliyot
  * @return {Object}
  */
-
 function formatAliyot(result, aliyot) {
   Object.keys(aliyot).forEach(num => {
     const aliyah = aliyot[num];
-
     if (typeof aliyah !== 'undefined') {
       const k = num == 'M' ? 'maftir' : num;
       result[k] = leyning.formatAliyahWithBook(aliyah);
@@ -668,31 +584,25 @@ function formatAliyot(result, aliyot) {
   });
   return result;
 }
+
 /**
  * @param {Leyning} reading
  * @return {Object}
  */
-
-
 function formatLeyningResult(reading) {
   const result = {};
-
   if (reading.summary) {
     result.torah = reading.summary;
   }
-
   if (reading.haftara) {
     result.haftarah = reading.haftara;
   }
-
   if (reading.sephardic) {
     result.haftarah_sephardic = reading.sephardic;
   }
-
   if (reading.fullkriyah) {
     formatAliyot(result, reading.fullkriyah);
   }
-
   if (reading.reason) {
     ['7', '8', 'M'].forEach(num => {
       if (reading.reason[num]) {
@@ -700,12 +610,10 @@ function formatLeyningResult(reading) {
         result[k] += ' | ' + reading.reason[num];
       }
     });
-
     if (reading.reason.haftara) {
       result.haftarah += ' | ' + reading.reason.haftara;
     }
   }
-
   return result;
 }
 
@@ -719,7 +627,6 @@ function formatLeyningResult(reading) {
  * @param {string} utmMedium
  * @return {string[]}
  */
-
 function getLinkAndGuid(ev, il, tzid, mainUrl, utmSource, utmMedium) {
   let link;
   let guid;
@@ -730,7 +637,6 @@ function getLinkAndGuid(ev, il, tzid, mainUrl, utmSource, utmMedium) {
   const descAnchor = makeAnchor(ev.getDesc());
   const anchor = `${dtAnchor}-${descAnchor}`;
   const url0 = ev.url();
-
   if (url0) {
     link = appendIsraelAndTracking(url0, il, utmSource, utmMedium).replace(/&/g, '&amp;');
     guid = `${url0}#${anchor}`;
@@ -740,10 +646,8 @@ function getLinkAndGuid(ev, il, tzid, mainUrl, utmSource, utmMedium) {
     guid = url1.replace(/&/g, '&amp;') + `#${anchor}`;
     link = `${url}#${anchor}`;
   }
-
   return [link, guid];
 }
-
 const localeToLg = {
   's': 'en',
   'a': 'en',
@@ -752,12 +656,12 @@ const localeToLg = {
   'ah': 'en',
   'sh': 'en'
 };
+
 /**
  * @param {Event[]} events
  * @param {CalOptions} options
  * @return {string}
  */
-
 function eventsToRss2(events, options) {
   options.dayFormat = new Intl.DateTimeFormat('en-US', {
     weekday: 'long',
@@ -794,6 +698,7 @@ function eventsToRss2(events, options) {
   str += '</channel>\n</rss>\n';
   return str;
 }
+
 /**
  * @private
  * @param {Event} ev
@@ -802,27 +707,22 @@ function eventsToRss2(events, options) {
  * @param {string} lastBuildDate
  * @return {string}
  */
-
 function getPubDate(ev, evPubDate, evDate, lastBuildDate) {
   if (evPubDate) {
     const dt = ev.eventTime;
-
     if (dt) {
       return dt.toUTCString();
     }
-
     return evDate.toUTCString().replace(/ \S+ GMT$/, ' 00:00:00 GMT');
   }
-
   return lastBuildDate;
 }
+
 /**
  * @param {Event} ev
  * @param {CalOptions} options
  * @return {string}
  */
-
-
 function eventToRssItem2(ev, options) {
   let subj = ev.render();
   const evDate = ev.getDate().greg();
@@ -840,10 +740,8 @@ function eventToRssItem2(ev, options) {
   const desc = ev.getDesc();
   const candles = desc === 'Havdalah' || desc === 'Candle lighting';
   let memo;
-
   if (candles) {
     const colon = subj.indexOf(': ');
-
     if (colon != -1) {
       const options = {
         location,
@@ -856,7 +754,6 @@ function eventToRssItem2(ev, options) {
   } else {
     memo = ev.getFlags() & core.flags.PARSHA_HASHAVUA ? makeTorahMemoText(ev, il) : ev.memo || holidayDescription[ev.basename()];
   }
-
   const dayFormat = options.dayFormat;
   const description = memo || dayFormat.format(evDate);
   const geoTags = cat0 == 'candles' ? `<geo:lat>${location.getLatitude()}</geo:lat>\n<geo:long>${location.getLongitude()}</geo:long>\n` : '';
@@ -878,15 +775,12 @@ ${geoTags}</item>
  * @param {boolean} il true if Israel
  * @return {Object}
  */
-
 function eventToFullCalendar(ev, tzid, il) {
   const classes = getEventCategories(ev);
   const mask = ev.getFlags();
-
   if (classes[0] == 'holiday' && mask & core.flags.CHAG) {
     classes.push('yomtov');
   }
-
   const timed = Boolean(ev.eventTime);
   const title = shouldRenderBrief(ev) ? ev.renderBrief() : ev.render();
   const start = timed ? core.Zmanim.formatISOWithTimeZone(tzid, ev.eventTime) : toISOString(ev.getDate().greg());
@@ -897,30 +791,23 @@ function eventToFullCalendar(ev, tzid, il) {
     className: classes.join(' ')
   };
   const hebrew = ev.renderBrief('he');
-
   if (hebrew) {
     result.hebrew = core.Locale.hebrewStripNikkud(hebrew);
   }
-
   const url = ev.url();
-
   if (url) {
     result.url = appendIsraelAndTracking(url, il, 'js', 'fc');
   }
-
   const desc = ev.getDesc();
   const candles = desc === 'Havdalah' || desc === 'Candle lighting';
-
   if (!candles) {
     const memo = mask & core.flags.PARSHA_HASHAVUA ? makeTorahMemoText(ev, il) : ev.memo || holidayDescription[ev.basename()];
-
     if (memo) {
       result.description = memo;
     } else if (typeof ev.linkedEvent !== 'undefined') {
       result.description = ev.linkedEvent.render();
     }
   }
-
   return result;
 }