fix Teams link, better iCal support (drop base64)

jekuer · jekuer · commit c97d3b311092 · 2022-02-24T21:44:52.000+01:00
diff --git a/README.md b/README.md
@@ -226,6 +226,7 @@ The code is available under the [MIT license (with “Commons Clause” License
 
 ## Changelog (without bug fixes)
 
+* v1.6 : supporting Microsoft Teams
 * v1.5 : update to date format and better accesibility
 * v1.4 : schema.org support (also changed some keys in the JSON!)
 * v1.3 : new license (MIT with “Commons Clause”)
@@ -237,3 +238,4 @@ The code is available under the [MIT license (with “Commons Clause” License
 ## Kudos go to
 * [github.com/dudewheresmycode](https://github.com/dudewheresmycodee)
 * [uxwing.com](https://uxwing.com)
+* all contributors!
diff --git a/assets/css/atcb.css b/assets/css/atcb.css
@@ -3,7 +3,7 @@
  * Add-to-Calendar Button
  * ++++++++++++++++++++++
  * 
- * Version: 1.5.1
+ * Version: 1.6.0
  * Creator: Jens Kuerschner (https://jenskuerschner.de)
  * Project: https://github.com/jekuer/add-to-calendar-button
  * License: MIT with “Commons Clause” License Condition v1.0
diff --git a/assets/js/atcb.js b/assets/js/atcb.js
@@ -3,7 +3,7 @@
  * Add-to-Calendar Button
  * ++++++++++++++++++++++
  */
-const atcbVersion = '1.5.1';
+const atcbVersion = '1.6.0';
 /* Creator: Jens Kuerschner (https://jenskuerschner.de)
  * Project: https://github.com/jekuer/add-to-calendar-button
  * License: MIT with “Commons Clause” License Condition v1.0
@@ -501,8 +501,9 @@ function atcb_generate_teams(data) {
   let formattedDate = atcb_generate_time(data, 'delimiters', 'microsoft');
   url += '&startTime=' + formattedDate['start'] + '&endTime=' + formattedDate['end'];
   // add details (if set)
+  let locationString = '';
   if (data['location'] != null && data['location'] != '') {
-    let locationString = encodeURIComponent(data['location']);
+    locationString = encodeURIComponent(data['location']);
     url += '&location=' + locationString; // workaround putting the location into the description, since the native field is not supported yet
     locationString += ' // ';
   }
@@ -543,7 +544,7 @@ function atcb_generate_ical(data) {
    "END:VEVENT",
    "END:VCALENDAR"
   ];
-  let dlurl = 'data:text/calendar;base64,'+btoa(ics_lines.join('\r\n').replace(/[\u00A0-\u2666]/g, function(c) { return '&#' + c.charCodeAt(0) + ';'; })); // includes a fix to not throw an error with non-Latin1 characters. However, still needs improvement, since it shows up encoded in the iCal file.
+  let dlurl = 'data:text/calendar;charset=utf-8,'+encodeURIComponent(ics_lines.join('\r\n'));
   try {
     if (!window.ActiveXObject) {
       let save = document.createElement('a');
diff --git a/assets/js/atcb.min.js b/assets/js/atcb.min.js
diff --git a/assets/js/atcb.min.js.map b/assets/js/atcb.min.js.map
diff --git a/index.html b/index.html
@@ -121,13 +121,13 @@
     </style>
 
     <!-- load the general button css -->
-    <link rel="stylesheet" href="./assets/css/atcb.min.css?v=1.5.1">
+    <link rel="stylesheet" href="./assets/css/atcb.min.css?v=1.6.0">
 
   </head>
   <body>
     <div class="container">
 
-      <h1>Add-to-Calendar Button <span id="tinyVersion">v1.5.1</span></h1>
+      <h1>Add-to-Calendar Button <span id="tinyVersion">v1.6.0</span></h1>
       <h2>A convenient JavaScript snippet, which lets you create beautiful buttons, where people can add events to their calendars.</h2>
       <p class="github">
         <a target="_blank" href="https://github.com/jekuer/add-to-calendar-button" class="clean">
@@ -149,7 +149,7 @@ <h3>Example 1: The usual One</h3>
           <div class="atcb" style="display:none;">
             {
               "name":"Reminder to check the add-to-calendar-button repo",
-              "description":"Check out the maybe easiest way to include add-to-calendar-buttons to your website at: [url]https://github.com/jekuer/add-to-calendar-button[/url]",
+              "description":"Check out the maybe easiest way<br>è<br>Ц<br> to include add-to-calendar-buttons to your website at: [url]https://github.com/jekuer/add-to-calendar-button[/url]",
               "startDate":"2022-01-14",
               "endDate":"2022-01-18",
               "startTime":"10:15",
@@ -515,7 +515,7 @@ <h3>Example 7: Schema.org Event Markup</h3>
 
 
     <!-- load the button js -->
-    <script type="application/javascript" src="./assets/js/atcb.min.js?v=1.5.1" defer></script>
+    <script type="application/javascript" src="./assets/js/atcb.min.js?v=1.6.0" defer></script>
 
     
   </body>
diff --git a/npm_dist/atcb_npm.js b/npm_dist/atcb_npm.js
@@ -3,7 +3,7 @@
  * Add-to-Calendar Button
  * ++++++++++++++++++++++
  */
-const atcbVersion = '1.5.1';
+const atcbVersion = '1.6.0';
 /* Creator: Jens Kuerschner (https://jenskuerschner.de)
  * Project: https://github.com/jekuer/add-to-calendar-button
  * License: MIT with “Commons Clause” License Condition v1.0
@@ -501,8 +501,9 @@ function atcb_generate_teams(data) {
   let formattedDate = atcb_generate_time(data, 'delimiters', 'microsoft');
   url += '&startTime=' + formattedDate['start'] + '&endTime=' + formattedDate['end'];
   // add details (if set)
+  let locationString = '';
   if (data['location'] != null && data['location'] != '') {
-    let locationString = encodeURIComponent(data['location']);
+    locationString = encodeURIComponent(data['location']);
     url += '&location=' + locationString; // workaround putting the location into the description, since the native field is not supported yet
     locationString += ' // ';
   }
@@ -543,7 +544,7 @@ function atcb_generate_ical(data) {
    "END:VEVENT",
    "END:VCALENDAR"
   ];
-  let dlurl = 'data:text/calendar;base64,'+btoa(ics_lines.join('\r\n').replace(/[\u00A0-\u2666]/g, function(c) { return '&#' + c.charCodeAt(0) + ';'; })); // includes a fix to not throw an error with non-Latin1 characters. However, still needs improvement, since it shows up encoded in the iCal file.
+  let dlurl = 'data:text/calendar;charset=utf-8,'+encodeURIComponent(ics_lines.join('\r\n'));
   try {
     if (!window.ActiveXObject) {
       let save = document.createElement('a');
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "add-to-calendar-button",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "A convenient JavaScript snippet, which lets you create beautiful buttons, where people can add events to their calendars.",
   "main": "npm_dist/atcb_npm.js",
   "types": "index.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* Add-to-Calendar Button`
`4`	`4`	`* ++++++++++++++++++++++`
`5`	`5`	`*`
`6`		`- * Version: 1.5.1`
	`6`	`+ * Version: 1.6.0`
`7`	`7`	`* Creator: Jens Kuerschner (https://jenskuerschner.de)`
`8`	`8`	`* Project: https://github.com/jekuer/add-to-calendar-button`
`9`	`9`	`* License: MIT with “Commons Clause” License Condition v1.0`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "add-to-calendar-button",`
`3`		`- "version": "1.5.1",`
	`3`	`+ "version": "1.6.0",`
`4`	`4`	`"description": "A convenient JavaScript snippet, which lets you create beautiful buttons, where people can add events to their calendars.",`
`5`	`5`	`"main": "npm_dist/atcb_npm.js",`
`6`	`6`	`"types": "index.d.ts",`