@knight-lab/timelinejs
Advanced tools
Comparing version 3.8.16 to 3.8.17
{ | ||
"name": "@knight-lab/timelinejs", | ||
"version": "3.8.16", | ||
"version": "3.8.17", | ||
"license": "MPL-2.0", | ||
"description": "TimelineJS v3: A Storytelling Timeline built in JavaScript, made by Northwestern University Knight Lab.", | ||
"dependencies": { | ||
"dompurify": "^2.0.11" | ||
"dompurify": "^2.2.7" | ||
}, | ||
@@ -25,3 +25,3 @@ "devDependencies": { | ||
"less-loader": "^6.1.1", | ||
"lodash": "^4.17.19", | ||
"lodash": "^4.17.21", | ||
"mini-css-extract-plugin": "^0.9.0", | ||
@@ -28,0 +28,0 @@ "npm-run-all": "^4.1.5", |
@@ -187,3 +187,3 @@ /* | ||
name: "Video", | ||
match_str: /(mp4)(\?.*)?$/i, | ||
match_str: /(mp4|webm)(\?.*)?$/i, | ||
cls: Video | ||
@@ -190,0 +190,0 @@ }, |
import { Media } from "../Media"; | ||
import * as Browser from "../../core/Browser" | ||
import { trace } from "../../core/Util"; | ||
@@ -44,2 +45,3 @@ export default class Audio extends Media { | ||
this._el.content_item.innerHTML += "Your browser doesn't support HTML5 audio with " + this._el.source_item.type; | ||
this.player_element = this._el.content_item | ||
} | ||
@@ -53,2 +55,9 @@ | ||
_stopMedia() { | ||
if (this.player_element) { | ||
this.player_element.pause() | ||
} | ||
} | ||
_getType(url, reg) { | ||
@@ -55,0 +64,0 @@ var ext = url.match(reg); |
@@ -44,2 +44,4 @@ import { Media } from "../Media"; | ||
this._el.content_item.innerHTML += "Your browser doesn't support HTML5 video with " + this._el.source_item.type; | ||
this.player_element = this._el.content_item | ||
} | ||
@@ -53,2 +55,8 @@ | ||
_stopMedia() { | ||
if (this.player_element) { | ||
this.player_element.pause() | ||
} | ||
} | ||
_getType(url, reg) { | ||
@@ -61,2 +69,5 @@ var ext = url.match(reg); | ||
break; | ||
case "webm": | ||
type += "webm"; | ||
break; | ||
default: | ||
@@ -63,0 +74,0 @@ type = "video"; |
@@ -53,4 +53,9 @@ import * as DOM from "../dom/DOM" | ||
* the Timeline should be bound | ||
* @param {object} - a JavaScript object conforming to the TimelineJS | ||
* configuration format | ||
* @param {object|String} - a JavaScript object conforming to the TimelineJS | ||
* configuration format, or a String which is the URL for a Google Sheets document | ||
* or JSON configuration file which Timeline will retrieve and parse into a JavaScript object. | ||
* NOTE: do not pass a JSON String for this. TimelineJS doesn't try to distinguish a | ||
* JSON string from a URL string. If you have a JSON String literal, parse it using | ||
* `JSON.parse` before passing it to the constructor. | ||
* | ||
* @param {object} [options] - a JavaScript object specifying | ||
@@ -57,0 +62,0 @@ * presentation options |
@@ -454,3 +454,3 @@ { | ||
"text": { | ||
"headline": "Video", | ||
"headline": "Video (mp4)", | ||
"text": "A URL to a video file (mp4) will be rendered using the browser's native video player." | ||
@@ -461,2 +461,16 @@ } | ||
"media": { | ||
"url": "https://file-examples-com.github.io/uploads/2020/03/file_example_WEBM_480_900KB.webm", | ||
"credit": "file-examples.com" | ||
}, | ||
"start_date": { | ||
"year": "1927", | ||
"month": "8" | ||
}, | ||
"text": { | ||
"headline": "Video (webm)", | ||
"text": "The Video media type also supports webm files." | ||
} | ||
}, | ||
{ | ||
"media": { | ||
"url": "https://lakeshore.wistia.com/medias/g2h5ddrucc", | ||
@@ -463,0 +477,0 @@ "credit": "Wistia" |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
5380248
23796
Updateddompurify@^2.2.7