Merge pull request #90 from bbc/sync-upstream-4.7.3

Sync upstream 4.7.3

Author: jlks

.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-    browser-tools: circleci/[email protected].1
+    browser-tools: circleci/[email protected].4
 
 executors:
     dashjs-executor:
@@ -49,7 +49,8 @@ commands:
 
     build_unit_test_steps:
         steps:
-            - browser-tools/install-browser-tools
+            - browser-tools/install-browser-tools:
+                chrome-version: 116.0.5845.96 # TODO remove this when google updates the chrome driver
             -   run:
                     name: Build and run unit tests
                     command: |

.gitignore

@@ -188,3 +188,7 @@ build/typings/
 
 # Vim
 .vimrc
+
+#Karma Functional tests
+test/functional-karma/coverage
+test/functional-karma/results

AUTHORS.md

@@ -48,3 +48,4 @@
 * @epiclabsDASH [Jesus Oliva, Epic Labs]
 * @adripanico [Adrian Caballero, Epic Labs]
 * @ahfarmer [Andrew Farmer, Rhombus Systems]
+* @matvp91 [Matthias Van Parijs]

README.md

@@ -184,7 +184,7 @@ When it is all done, it should look similar to this:
     * ```npm run doc```
 
 ### Troubleshooting
-* 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.
+* 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.
 
 ### License
 dash.js is released under [BSD license](https://github.com/Dash-Industry-Forum/dash.js/blob/development/LICENSE.md)

build/jsdoc/jsdoc_conf.json

@@ -12,7 +12,8 @@
         "plugins/markdown"
     ],
     "markdown": {
-        "hardwrap": true
+        "hardwrap": true,
+        "idInHeadings": true
     },
     "templates": {
         "cleverLinks": true,
@@ -21,6 +22,7 @@
         "outputSourceFiles": true,
         "outputSourcePath": true,
         "systemName": "dash.js",
+        "systemSummary": "",
         "copyright": "<h3>DASH Industry Forum</h3>",
         "footer": "",
         "navType": "horizontal",
@@ -31,11 +33,20 @@
         "highlightTutorialCode": true
     },
     "opts": {
-        "template": "../../node_modules/ink-docstrap/template",
+        "template": "../../node_modules/clean-jsdoc-theme",
         "encoding": "utf8",
         "recurse": true,
         "query": "value",
         "private": false,
-        "lenient": true
+        "lenient": true,
+        "verbose": true,
+        "destination": "docs/",
+        "theme_opts": {
+            "default_theme": "light",
+            "include_css": ["./build/style_jsdoc/jsdoc-custom.css"],
+            "favicon": "https://dashif.org/img/favicon.ico",
+            "includeFilesListInHomepage": true,
+            "homepageTitle": "dash.js API Docs"
+        }
     }
 }

build/style_jsdoc/jsdoc-custom.css

@@ -0,0 +1,18 @@
+td, th {
+    padding: 10px 10px !important;
+    word-wrap: break-word;
+    max-width: 50px;
+    white-space: inherit;
+    text-overflow: ellipsis;
+  }
+
+  /* Optional: Style the first and last columns differently */
+  td:nth-child(5), th:nth-child(5) {
+    max-width: 150px !important;
+  } 
+  td:first-child, th:first-child {
+    max-width: 100px !important;
+  } 
+.main-wrapper {
+    padding: 0 !important;
+}

build/webpack.base.js

@@ -5,6 +5,7 @@ const out_dir = '../dist';
 
 const config = {
     devtool: 'source-map',
+    target: ['web', 'es5'],
     output: {
         path: path.resolve(__dirname, out_dir),
         publicPath: '/dist/',

contrib/akamai/controlbar/ControlBar.js

@@ -372,7 +372,7 @@ var ControlBar = function (dashjsMediaPlayer, displayUTCTimeCodes) {
                 durationDisplay.onclick = seekLive;
                 durationDisplay.classList.add('live-icon');
             }
-        } else if (!isNaN(value)) {
+        } else if (!isNaN(value) && isFinite(value)) {
             durationDisplay.textContent = displayUTCTimeCodes ? self.player.formatUTC(value) : self.player.convertToTimeCode(value);
             durationDisplay.classList.remove('live-icon');
         }