Skip to content

Commit 5efbdc5

Browse files
committed
Merge tag 'v4.7.3' into 4.7.1-as2
# Conflicts: # package.json # src/streaming/rules/abr/AbandonRequestsRule.js
2 parents 94e801f + bda552d commit 5efbdc5

File tree

62 files changed

+3973
-1118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+3973
-1118
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ When it is all done, it should look similar to this:
184184
* ```npm run doc```
185185

186186
### Troubleshooting
187-
* In case the build process is failing make sure to use an up-to-date node.js version. The build process was successfully tested with node.js version 14.16.1.
187+
* In case the build process is failing make sure to use an up-to-date node.js version. The build process was successfully tested with node.js version 20.10.0.
188188

189189
### License
190190
dash.js is released under [BSD license](https://github.com/Dash-Industry-Forum/dash.js/blob/development/LICENSE.md)

build/jsdoc/jsdoc_conf.json

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"plugins/markdown"
1313
],
1414
"markdown": {
15-
"hardwrap": true
15+
"hardwrap": true,
16+
"idInHeadings": true
1617
},
1718
"templates": {
1819
"cleverLinks": true,
@@ -21,6 +22,7 @@
2122
"outputSourceFiles": true,
2223
"outputSourcePath": true,
2324
"systemName": "dash.js",
25+
"systemSummary": "",
2426
"copyright": "<h3>DASH Industry Forum</h3>",
2527
"footer": "",
2628
"navType": "horizontal",
@@ -31,11 +33,20 @@
3133
"highlightTutorialCode": true
3234
},
3335
"opts": {
34-
"template": "../../node_modules/ink-docstrap/template",
36+
"template": "../../node_modules/clean-jsdoc-theme",
3537
"encoding": "utf8",
3638
"recurse": true,
3739
"query": "value",
3840
"private": false,
39-
"lenient": true
41+
"lenient": true,
42+
"verbose": true,
43+
"destination": "docs/",
44+
"theme_opts": {
45+
"default_theme": "light",
46+
"include_css": ["./build/style_jsdoc/jsdoc-custom.css"],
47+
"favicon": "https://dashif.org/img/favicon.ico",
48+
"includeFilesListInHomepage": true,
49+
"homepageTitle": "dash.js API Docs"
50+
}
4051
}
4152
}

build/style_jsdoc/jsdoc-custom.css

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
td, th {
2+
padding: 10px 10px !important;
3+
word-wrap: break-word;
4+
max-width: 50px;
5+
white-space: inherit;
6+
text-overflow: ellipsis;
7+
}
8+
9+
/* Optional: Style the first and last columns differently */
10+
td:nth-child(5), th:nth-child(5) {
11+
max-width: 150px !important;
12+
}
13+
td:first-child, th:first-child {
14+
max-width: 100px !important;
15+
}
16+
.main-wrapper {
17+
padding: 0 !important;
18+
}

contrib/akamai/controlbar/ControlBar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ var ControlBar = function (dashjsMediaPlayer, displayUTCTimeCodes) {
375375
durationDisplay.onclick = seekLive;
376376
durationDisplay.classList.add('live-icon');
377377
}
378-
} else if (!isNaN(value)) {
378+
} else if (!isNaN(value) && isFinite(value)) {
379379
durationDisplay.textContent = displayUTCTimeCodes ? self.player.formatUTC(value) : self.player.convertToTimeCode(value);
380380
durationDisplay.classList.remove('live-icon');
381381
}

0 commit comments

Comments
 (0)