diff options
| author | Sam Potts <sam@potts.es> | 2018-06-29 00:21:28 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-06-29 00:21:28 +1000 |
| commit | 0c9572f0a18d602fa03dc21326baac5e7c75afe8 (patch) | |
| tree | 5b9ce5a9c4f9c1666a68b6b5fd4471a45d0f6927 | |
| parent | c99607c85a293a565aa4110a69d04a9e8e9450b6 (diff) | |
| parent | e2010bcd1ab9801a27056ef462e2b40c8d692ac8 (diff) | |
| download | plyr-0c9572f0a18d602fa03dc21326baac5e7c75afe8.tar.lz plyr-0c9572f0a18d602fa03dc21326baac5e7c75afe8.tar.xz plyr-0c9572f0a18d602fa03dc21326baac5e7c75afe8.zip | |
Merge branch 'develop' of github.com:sampotts/plyr into develop
| -rw-r--r-- | src/js/controls.js | 10 | ||||
| -rw-r--r-- | src/sass/components/controls.scss | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/js/controls.js b/src/js/controls.js index 4c2266c2..2bc8b4de 100644 --- a/src/js/controls.js +++ b/src/js/controls.js @@ -633,6 +633,16 @@ const controls = { return; } + // If duration is the 2**32 (shaka), Infinity (HLS), DASH-IF (Number.MAX_SAFE_INTEGER || Number.MAX_VALUE) indicating live we hide the currentTime and progressbar. + // https://github.com/video-dev/hls.js/blob/5820d29d3c4c8a46e8b75f1e3afa3e68c1a9a2db/src/controller/buffer-controller.js#L415 + // https://github.com/google/shaka-player/blob/4d889054631f4e1cf0fbd80ddd2b71887c02e232/lib/media/streaming_engine.js#L1062 + // https://github.com/Dash-Industry-Forum/dash.js/blob/69859f51b969645b234666800d4cb596d89c602d/src/dash/models/DashManifestModel.js#L338 + if (this.duration >= 2**32) { + toggleHidden(this.elements.display.currentTime, true); + toggleHidden(this.elements.progress, true); + return; + } + // Update ARIA values if (is.element(this.elements.inputs.seek)) { this.elements.inputs.seek.setAttribute('aria-valuemax', this.duration); diff --git a/src/sass/components/controls.scss b/src/sass/components/controls.scss index 91db1b20..35f00f63 100644 --- a/src/sass/components/controls.scss +++ b/src/sass/components/controls.scss @@ -12,6 +12,7 @@ align-items: center; display: flex; text-align: center; + justify-content: flex-end; // Spacing > .plyr__control, @@ -22,7 +23,7 @@ &:first-child, &:first-child + [data-plyr='pause'] { - margin-left: 0; + margin-right: auto; } } |