@knight-lab/timelinejs 3.9.3 → 3.9.4

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "@knight-lab/timelinejs",
-    "version": "3.9.3",
+    "version": "3.9.4",
     "license": "MPL-2.0",
     "description": "TimelineJS v3: A Storytelling Timeline built in JavaScript, made by Northwestern University Knight Lab.",
     "dependencies": {
-        "dompurify": "^2.2.7",
+        "dompurify": "^3.1.7",
         "wicg-inert": "^3.1.2"
     },
     "devDependencies": {

package/src/js/core/ConfigFactory.js

@@ -65,7 +65,8 @@ function extractEventFromCSVObject(orig_row) {
             caption: row['Media Caption'] || '',
             credit: row['Media Credit'] || '',
             url: row['Media'] || '',
-            thumbnail: row['Media Thumbnail'] || ''
+            thumbnail: row['Media Thumbnail'] || '',
+            alt: row['Alt Text'] || ''
         },
         text: {
             headline: row['Headline'] || '',
@@ -223,7 +224,7 @@ var buildGoogleFeedURL = function(key, api_version) {
     }
 }
 
-async function jsonFromGoogleURL(google_url, options) {
+export async function jsonFromGoogleURL(google_url, options) {
 
     if (!options['sheets_proxy']) {
         throw new TLError("Proxy option must be set to read data from Google")

package/src/js/index.js

@@ -1,7 +1,4 @@
 import "../less/TL.Timeline.less"
-export { Timeline }
-from "./timeline/Timeline"
-export { parseGoogleSpreadsheetURL }
-from "./core/ConfigFactory"
-export { lookupMediaType }
-from "./media/MediaType"
+export { Timeline, exportJSON } from "./timeline/Timeline"
+export { parseGoogleSpreadsheetURL } from "./core/ConfigFactory"
+export { lookupMediaType } from "./media/MediaType"

package/src/js/media/types/WikipediaImage.js

@@ -44,7 +44,7 @@ export default class WikipediaImage extends Media {
 
     _loadMedia() {
         var api_url,
-            image_width = this.options.width || 1000,
+            image_width = Math.round(this.options.width) || 1000, // value to WP API must be int
             language_code = this.getLanguage().lang.toLowerCase(),
             self = this;
 
@@ -140,8 +140,9 @@ export default class WikipediaImage extends Media {
 
     _getImageURL(w, h) {
         if (w && this.base_image_url) {
-            let match = this.base_image_url.match(/(\/\d+px-)/)
+            let match = this.base_image_url.match(/(\/[\d\.]+px-)/)
             if (match) {
+                w = Math.round(w) // WP image URLS 404 if floats are used so round it.
                 return this.base_image_url.replace(match[1], `/${w}px-`) // Wikipedia will autoscale the image for us
             }
         }
@@ -156,4 +157,4 @@ export default class WikipediaImage extends Media {
  * 
  * https://commons.wikimedia.org/w/api.php?action=query&titles=File:Beryl-Quartz-Emerald-Zambia-33mm_0885.jpg&prop=imageinfo&iiprop=url&&iiurlwidth=1000
  * https://commons.wikimedia.org/wiki/File:Beryl-Quartz-Emerald-Zambia-33mm_0885.jpg
- */
+ */

package/src/js/timeline/Timeline.js

@@ -5,7 +5,7 @@ import Message from "../ui/Message"
 import { Language, fallback, loadLanguage } from "../language/Language"
 import { I18NMixins } from "../language/I18NMixins";
 import Events from "../core/Events";
-import { makeConfig } from "../core/ConfigFactory"
+import { makeConfig, jsonFromGoogleURL } from "../core/ConfigFactory"
 import { TimelineConfig } from "../core/TimelineConfig"
 import { TimeNav } from "../timenav/TimeNav"
 import * as Browser from "../core/Browser"
@@ -1018,4 +1018,14 @@ class Timeline {
 
 classMixin(Timeline, I18NMixins, Events)
 
-export { Timeline }
+async function exportJSON(url, proxy_url) {
+
+    if (!proxy_url) {
+        proxy_url = 'https://sheets-proxy.knightlab.com/proxy/'
+    }
+
+    let json = await jsonFromGoogleURL(url, {sheets_proxy: proxy_url})
+    return json
+}
+
+export { Timeline, exportJSON }

package/src/template/all-media-types.json

@@ -7,7 +7,7 @@
         },
         "text": {
             "headline": "TimelineJS Media Types",
-            "text": "<p>TimelineJS supports many media types. This provides a simple way to test them all. This page tests a simple image on a remote server. Also, if the Timeline was created with the <code>soundcite</code> option set to <code>true</code> then   <span class='soundcite' data-url='https://soundcite.knightlab.com/media/bach-cello-suite.mp3' data-start='0' data-end='164000' data-plays='1'>this should be an active SoundCite player.</span></p>"
+            "text": "<p>TimelineJS supports many media types. This provides a simple way to test them all. This page tests a simple image on a remote server. Also, if the Timeline was created with the <code>soundcite</code> option set to <code>true</code> then   <span class='soundcite' data-url='https://soundcite.knightlab.com/media/bach-cello-suite.mp3' data-start='0' data-end='164000' data-plays='1'>this should be an active SoundCite player.</span></p><p><a target=\"_self\" href=\"#wikipedia-images\">click to jump to Wikipedia Images</a></p>"
         },
         "background": {
             "color": "papayawhip"
@@ -388,10 +388,10 @@
 
         {
             "media": {
-                "url": "https://en.wikipedia.org/wiki/1997_International_Tennis_Championships_%E2%80%93_Doubles",
+                "url": "https://fr.wikipedia.org/wiki/Bataille_de_Champigny#/media/Fichier:Champigny,_le_four_%C3%A0_chaux_(d%C3%A9tail).jpg",
                 "caption": "1997 International Tennis Championships - Doubles",
                 "credit": "Wikipedia",
-                "link": "https://en.wikipedia.org/wiki/1997_International_Tennis_Championships_%E2%80%93_Doubles"
+                "link": "https://fr.wikipedia.org/wiki/Bataille_de_Champigny#/media/Fichier:Champigny,_le_four_%C3%A0_chaux_(d%C3%A9tail).jpg"
             },
             "start_date": {
                 "year": "1920"
@@ -519,7 +519,7 @@
         },
         {
             "media": {
-                "url": "https://file-examples.com/storage/fef12739526267ac9a2b543/2017/04/file_example_MP4_480_1_5MG.mp4",
+                "url": "https://file-examples.com/storage/febf69dcf3656dfd992b0fa/2017/04/file_example_MP4_480_1_5MG.mp4",
                 "credit": "file-examples.com"
             },
             "start_date": {
@@ -548,6 +548,7 @@
             "group": "Video"
         },
         {
+            "unique_id": "wistia",
             "media": {
                 "url": "https://lakeshore.wistia.com/medias/g2h5ddrucc",
                 "credit": "Wistia"
@@ -562,6 +563,7 @@
             "group": "Video"
         },
         {
+            "unique_id": "wikipedia-images",
             "media": {
                 "url": "https://de.wikipedia.org/wiki/Beryllium#/media/Datei:Beryl-Quartz-Emerald-Zambia-33mm_0885.jpg",
                 "credit": "Wikipedia"
@@ -576,6 +578,7 @@
             "group": "Image"
         },
         {
+            "unique_id": "wikipedia-commons",
             "media": {
                 "url": "https://commons.wikimedia.org/wiki/File:David-Bowie_Chicago_2002-08-08_photoby_Adam-Bielawski-cropped.jpg",
                 "credit": "Wikipedia"
@@ -590,4 +593,4 @@
             "group": "Image"
         }
     ]
-}
+}