fix(Tools): Prevent formatDate() from using global timezones prefixed…

… with a slash
sebbo2002 · Apr 14, 2021 · 85ab7b2 · 85ab7b2
1 parent f5d9eb3
commit 85ab7b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/calendar.ts b/src/calendar.ts
@@ -319,7 +319,7 @@ export default class ICalCalendar {
      *
      * @since 2.0.0
      */
-    timezone(timezone: ICalTimezone): this;
+    timezone(timezone: ICalTimezone | string | null): this;
     timezone(timezone?: ICalTimezone | string | null): this | string | null {
         if (timezone === undefined) {
             return this.data.timezone?.name || null;

diff --git a/src/tools.ts b/src/tools.ts
@@ -9,6 +9,10 @@ import type { RRule } from 'rrule';
 import {ICalDateTimeValue, ICalOrganizer} from './types';
 
 export function formatDate (timezone: string | null, d: ICalDateTimeValue, dateonly?: boolean, floating?: boolean): string {
+    if(timezone?.startsWith('/')) {
+        timezone = timezone.substr(1);
+    }
+
     if(typeof d === 'string' || d instanceof Date) {
         const m = new Date(d);