Skip to content

Commit 13b88f0

Browse files
committed
more merging upstream changes
1 parent 7833813 commit 13b88f0

35 files changed

+249
-927
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
3.9.8 (2025-05-23)
2+
-------------------------
3+
#894 Fixes previous/next button positioning when a timeline is a child of an element with dir="rtl"
4+
5+
3.9.7 (2025-03-11)
6+
-------------------------
7+
* #834 Improved timegroup-message element contrast
8+
* #890 Fixes to support modern Google Sheets publish-to-web URL format
9+
110
3.9.6 (2025-01-10)
211
-------------------------
312
* Change initial computation of component heights to address axis labels overflowing

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Timeline uses `webpack` for bundling, and uses the `webpack-dev-server` as part
2828

2929
### Building
3030

31-
In order to "compile" TimelineJS for use in other contexts, after following the instructions above, run the command `npm run dist`. This will populate a directory, `dist/` in the rool of your checked-out repository, with the javascript and CSS necessary to self-host TimelineJS.
31+
In order to "compile" TimelineJS for use in other contexts, after following the instructions above, run the command `npm run dist`. This will populate a directory, `dist/` in the root of your checked-out repository, with the javascript and CSS necessary to self-host TimelineJS.
3232

3333

3434
### Testing

package-lock.json

Lines changed: 80 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@knight-lab/timelinejs",
3-
"version": "3.9.6",
3+
"version": "3.9.8",
44
"license": "MPL-2.0",
55
"description": "TimelineJS v3: A Storytelling Timeline built in JavaScript, made by Northwestern University Knight Lab.",
66
"dependencies": {

src/embed/index.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,14 @@
136136

137137
for (var i = 0; i < param_str.length; i++) {
138138
var uv = param_str[i].split('=');
139-
url_vars[uv[0]] = uv[1];
139+
let k = uv[0], v = uv[1];
140+
try {
141+
k = decodeURIComponent(k);
142+
} catch (e) {} // some legacy values are not properly encoded
143+
try {
144+
v = decodeURIComponent(v);
145+
} catch (e) {} // some legacy values are not properly encoded esp width=100%
146+
url_vars[k] = v;
140147
}
141148

142149
return url_vars;

0 commit comments

Comments
 (0)