diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eedcd451..f38ff11cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ CHANGELOG ## HEAD (Unreleased) * Added cross-browser isArray for cross-frame support. fixes #1195 ([view](https://github.com/videojs/video.js/pull/1218)) +* Fixed support for webvtt chapters. Fixes #676. ([view](https://github.com/videojs/video.js/pull/1221)) -------------------- diff --git a/src/css/video-js.less b/src/css/video-js.less index 18c6a399a..80ef7cace 100644 --- a/src/css/video-js.less +++ b/src/css/video-js.less @@ -100,6 +100,7 @@ The control icons are from a custom font. Each icon corresponds to a character @spinner4-icon: "\e01f"; @subtitles-icon: "\e00c"; @captions-icon: "\e008"; +@chapters-icon: "\e00c"; @share-icon: "\e00e"; @cog-icon: "\e600"; @@ -765,13 +766,24 @@ easily in the skin designer. http://designer.videojs.com/ } /* Subtitles Button */ -.vjs-default-skin .vjs-subtitles-button:before { content: @subtitles-icon; } +.vjs-default-skin .vjs-subtitles-button:before { + content: @subtitles-icon; +} /* Captions Button */ .vjs-default-skin .vjs-captions-button:before { content: @captions-icon; } +/* Chapters Button */ +.vjs-default-skin .vjs-chapters-button:before { + content: @chapters-icon; +} + +.vjs-default-skin .vjs-chapters-button.vjs-menu-button .vjs-menu .vjs-menu-content { + width: 20em; +} + /* Replacement for focus outline */ .vjs-default-skin .vjs-captions-button:focus .vjs-control-content:before, .vjs-default-skin .vjs-captions-button:hover .vjs-control-content:before { diff --git a/src/js/tracks.js b/src/js/tracks.js index d2ac76fb0..e753aff2e 100644 --- a/src/js/tracks.js +++ b/src/js/tracks.js @@ -941,11 +941,10 @@ vjs.ChaptersButton.prototype.createMenu = function(){ for (;i 0) {