Merge pull request #17 from add2cal/dev

Dev
add2cal · Aug 31, 2022 · 2b183a9 · 2b183a9
2 parents 7e4cb8f + 6621d2d
commit 2b183a9
Show file tree

Hide file tree

Showing 367 changed files with 1,322 additions and 1,338 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,4 @@
 package-lock.json linguist-generated=true -diff
-dist/**/* linguist-generated=true -diff
+dist/* linguist-generated=true -diff
 npm_dist/**/* linguist-generated=true -diff
 demo_assets/*/*.min.* linguist-generated=true -diff
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ OLSON_DIR ?= tzdata
 # gets expanded to today's date. There is also a vzic-merge.pl which can be
 # used to merge changes into a master set of VTIMEZONEs. If a VTIMEZONE has
 # changed, it bumps the version number on the end of this prefix. */
-TZID_PREFIX ?= /timezones-ical-library/%D/
+TZID_PREFIX ?= /timezones-ical-library/
 
 #
 # You shouldn't need to change the rest of the file.

diff --git a/dist/tzlib.js b/dist/tzlib.js
diff --git a/dist/tzlib.min.js b/dist/tzlib.min.js
diff --git a/dist/tzlib.min.js.map b/dist/tzlib.min.js.map
diff --git a/generator.js b/generator.js
@@ -3,7 +3,7 @@
  * Add to Calendar TimeZones iCal Library
  * ++++++++++++++++++++++++++++++++++++++
  *
- * Version: 1.1.4
+ * Version: 1.1.5
  * Creator: Jens Kuerschner (https://jenskuerschner.de)
  * Project: https://github.com/add2cal/timezones-ical-library
  * License: Apache-2.0

diff --git a/index.html b/index.html
@@ -55,7 +55,7 @@
     <script async defer data-website-id="f221953d-158e-46c9-88d1-3b05df00997a" src="./demo_assets/js/a.min.js" data-host-url="https://a.add-to-calendar-button.com" data-domains="tz.add-to-calendar-technology.com"></script>
 
     <!-- load some basic css just for this demo page here -->
-    <link rel="stylesheet" href="./demo_assets/css/demopage.min.css?v=1.1.4">
+    <link rel="stylesheet" href="./demo_assets/css/demopage.min.css?v=1.1.5">
 
   </head>
   <body itemscope itemtype="http://schema.org/WebSite">
@@ -77,7 +77,7 @@ <h1>
         <h2>The convenient way to directly access the most recent official time zone information for iCalendar files with JavaScript.</h2>
       </div>
       <div id="header-right">
-        <a target="_blank" rel="noopener" href="https://github.com/add2cal/time zones-ical-library" class="github">
+        <a target="_blank" rel="noopener" href="https://github.com/add2cal/timezones-ical-library" class="github">
           <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" height="50px" width="50px">
             <path d="M256 0C115.39 0 0 115.39 0 256c0 119.988 84.195 228.984 196 256v-84.695c-11.078 2.426-21.273 2.496-32.55-.828-15.13-4.465-27.422-14.543-36.547-29.9-5.816-9.812-16.125-20.453-26.88-19.672l-2.637-29.883c23.254-1.992 43.37 14.168 55.313 34.23 5.305 8.922 11.4 14.152 19.246 16.465 7.574 2.23 15.707 1.16 25.184-2.187 2.38-18.973 11.07-26.074 17.637-36.074v-.016c-66.68-9.945-93.254-45.32-103.8-73.242-13.977-37.074-6.477-83.39 18.238-112.66.48-.57 1.348-2.062 1.012-3.105-11.332-34.23 2.477-62.547 2.984-65.55 13.078 3.867 15.203-3.89 56.81 21.387l7.19 4.32c3.008 1.793 2.063.77 5.07.543 17.37-4.72 35.684-7.324 53.727-7.56 18.18.234 36.375 2.84 54.465 7.75l2.328.234c-.203-.03.633-.148 2.035-.984 51.973-31.48 50.105-21.19 64.043-25.723.504 3.008 14.13 31.785 2.918 65.582-1.512 4.656 45.06 47.3 19.246 115.754-10.547 27.934-37.117 63.31-103.797 73.254v.016c8.547 13.027 18.816 19.957 18.762 46.832V512c111.81-27.016 196-136.012 196-256C512 115.39 396.61 0 256 0zm0 0"/>
           </svg>
@@ -227,15 +227,15 @@ <h3>Background story</h3>
           This page is hosted via "GitHub Pages". It includes some very basic analytics, that still preserves your anonymity and does not use any cookies. However, mind that the GitHub privacy policy applies additionally (<a target="_blank" rel="noopener" href="https://docs.github.com/en/github/site-policy/github-privacy-statement">click here for details</a>).
         </p>
       </div>
-      <div id="tiny-version">v1.1.4</div>
+      <div id="tiny-version">v1.1.5</div>
 
     </div>
 
 
     <!-- js stuff -->
-    <script type="application/javascript" src="./dist/tzlib.min.js?v=1.1.4"></script>
+    <script type="application/javascript" src="./dist/tzlib.min.js?v=1.1.5"></script>
     <script type="application/javascript" src="./demo_assets/js/autocomplete.min.js"></script>
-    <script type="application/javascript" src="./demo_assets/js/demopage.min.js?v=1.1.4"></script>
+    <script type="application/javascript" src="./demo_assets/js/demopage.min.js?v=1.1.5"></script>
 
   </body>
 </html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "timezones-ical-library",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "engines": {
     "node": ">=14.20.0"
   },

diff --git a/src/tzlib.js b/src/tzlib.js
@@ -3,7 +3,7 @@
  * Add to Calendar TimeZones iCal Library
  * ++++++++++++++++++++++++++++++++++++++
  */
- const tzlibVersion = '1.1.4';
+ const tzlibVersion = '1.1.5';
 /* Creator: Jens Kuerschner (https://jenskuerschner.de)
  * Project: https://github.com/add2cal/timezones-ical-library
  * License: Apache-2.0
@@ -19,10 +19,6 @@ function tzlib_get_ical_block(tzName) {
     console.error('Given timezone not valid.');
     return '';
   }
-  // if symlink, follow
-  if (!tzlibZonesDB[`${tzName}`].startsWith('TZID')) {
-    return tzlib_get_offset(tzName, isoDate, isoTime);
-  }
   // otherwise, create the output
   return 'BEGIN:VTIMEZONE\r\n' + tzlibZonesDB[`${tzName}`].replace(/[^\w_\-:,;=\+\/<br>]/g,'').replace(/<br>/g, '\r\n') + '\r\nEND:VTIMEZONE';
 }
@@ -34,10 +30,6 @@ function tzlib_get_offset(tzName, isoDate, isoTime) {
     console.error('Given timezone not valid.');
     return '';
   }
-  // if symlink, follow
-  if (!tzlibZonesDB[`${tzName}`].startsWith('TZID')) {
-    return tzlib_get_offset(tzName, isoDate, isoTime);
-  }
   // validate date
   if (!isoDate.match(/^\d{4}-\d{2}-\d{2}$/)) {
     console.error('offset calculation failed: date misspelled [-> YYYY-MM-DD]');