Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1015 from friday/captions-fixes-again | Sam Potts | 2018-06-11 | 9 | -199/+214 |
|\ | | | | | Captions rewrite (use index internally to support missing or duplicate languages) | ||||
| * | Typo | Albin Larsson | 2018-06-10 | 1 | -2/+2 |
| | | |||||
| * | Fix #1017, fix #980, fix #1014: Captions rewrite (use index internally) | Albin Larsson | 2018-06-10 | 5 | -137/+159 |
| | | |||||
| * | controls.createMenuItem: Change input to object (too many params made it ↵ | Albin Larsson | 2018-06-10 | 1 | -13/+21 |
| | | | | | | | | hard to read) | ||||
| * | Avoid condition in getTracks | Albin Larsson | 2018-06-10 | 1 | -7/+4 |
| | | |||||
| * | Change debug warn 'Unsupported language option' to log 'Language option ↵ | Albin Larsson | 2018-06-10 | 1 | -1/+1 |
| | | | | | | | | doesn't yet exist' since it doesn't have to be an error | ||||
| * | Fix #1003: Formatted captions issue | Albin Larsson | 2018-06-10 | 3 | -2/+3 |
| | | |||||
| * | Merge captions setText and setCue into updateCues (fixes #998 and vimeo ↵ | Albin Larsson | 2018-06-08 | 4 | -57/+44 |
| | | | | | | | | cuechange event) | ||||
* | | Merge pull request #1020 from friday/1016 | Sam Potts | 2018-06-11 | 1 | -0/+8 |
|\ \ | | | | | | | Vimeo: Update playback state and assure events are triggered on load | ||||
| * | | Vimeo: Assure state is updated with autoplay (fixes #1016) | Albin Larsson | 2018-06-11 | 1 | -0/+8 |
| | | | |||||
* | | | Merge pull request #1021 from friday/vimeo-seek-while-playing | Sam Potts | 2018-06-11 | 2 | -4/+11 |
|\ \ \ | |/ / |/| | | Fix for YouTube and Vimeo pausing after seek | ||||
| * | | Fix problem with YouTube and Vimeo seeking while playing | Albin Larsson | 2018-06-11 | 2 | -4/+11 |
|/ / | |||||
* | | Restore default | Sam Potts | 2018-06-09 | 9 | -9/+8 |
| | | |||||
* | | Fix Sprite issue | Sam Potts | 2018-06-09 | 14 | -51/+58 |
|/ | |||||
* | Merge pull request #1007 from cky917/master | Sam Potts | 2018-06-08 | 16 | -25/+40 |
|\ | | | | | fix: After clicking on the progress bar, keyboard operations will not work. | ||||
| * | fix: when the seek input is focused and the video is playing, the space key ↵ | cky | 2018-06-06 | 1 | -0/+6 |
| | | | | | | | | can't make the video pause, because after 'keyup', it always make the video play | ||||
| * | fix: https://github.com/sampotts/plyr/issues/1006 | cky | 2018-06-06 | 1 | -1/+4 |
| | | |||||
| * | Update controls.md (fixes #996) | Sam Potts | 2018-06-02 | 1 | -5/+3 |
| | | |||||
| * | Merge branch 'master' of github.com:sampotts/plyr | Sam Potts | 2018-05-31 | 26 | -1888/+598 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # demo/dist/demo.css # dist/plyr.css # dist/plyr.js.map # dist/plyr.min.js # dist/plyr.min.js.map # dist/plyr.polyfilled.js.map # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map | ||||
| | * | Merge pull request #993 from sampotts/develop | Sam Potts | 2018-05-31 | 26 | -1926/+614 |
| | |\ | |_|/ |/| | | v3.3.10 | ||||
* | | | Fixed incorrect BEM formatting, fixed buffer alignment | Sam Potts | 2018-05-31 | 14 | -1581/+299 |
| | | | |||||
* | | | Merge pull request #988 from kim-company/translate-qualities | Sam Potts | 2018-05-31 | 14 | -273/+243 |
|\ \ \ | | | | | | | | | Translate quality badges and quality names | ||||
| * | | | Rename qualityName to label | Philip Giuliani | 2018-05-31 | 1 | -3/+3 |
| | | | | |||||
| * | | | Refactor getDeep method | Philip Giuliani | 2018-05-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Return undefined when the key is not present. | Philip Giuliani | 2018-05-30 | 9 | -14/+14 |
| | | | | |||||
| * | | | Rebuild | Philip Giuliani | 2018-05-30 | 8 | -172/+149 |
| | | | | |||||
| * | | | Rebuild | Philip Giuliani | 2018-05-30 | 4 | -6/+12 |
| | | | | |||||
| * | | | Add getDeep method to utils | Philip Giuliani | 2018-05-30 | 2 | -1/+6 |
| | | | | |||||
| * | | | Rebuild | Philip Giuliani | 2018-05-30 | 8 | -87/+71 |
| | | | | |||||
| * | | | Implement translation support for qualityName and qualityBadge | Philip Giuliani | 2018-05-30 | 2 | -23/+16 |
| | | | | |||||
| * | | | Allow nested translations | Philip Giuliani | 2018-05-30 | 1 | -2/+6 |
| | | | | |||||
| * | | | Accept quality 0 | Philip Giuliani | 2018-05-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | ESLint tweak | Sam Potts | 2018-05-30 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #990 from friday/travis | Sam Potts | 2018-05-31 | 3 | -1/+15 |
|\ \ \ \ | | | | | | | | | | | Travis integration | ||||
| * | | | | Lint and build in travis | Albin Larsson | 2018-05-30 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | Add npm scripts for linting and building | Albin Larsson | 2018-05-30 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Gulp: Add option to build only | Albin Larsson | 2018-05-30 | 1 | -1/+6 |
| |/ / / | |||||
* | | | | Merge pull request #992 from philipgiuliani/quality-resume-time | Sam Potts | 2018-05-31 | 1 | -3/+7 |
|\ \ \ \ | | | | | | | | | | | Wait for the metadata to be loaded before setting the currentTime | ||||
| * | | | | Wait for the metadata to be loaded before setting the currentTime | Philip Giuliani | 2018-05-31 | 1 | -3/+7 |
|/ / / / | |||||
* | | | | Merge pull request #989 from friday/pr-template | Sam Potts | 2018-05-31 | 1 | -5/+5 |
|\ \ \ \ | |/ / / |/| | | | Proposed changes to PR template | ||||
| * | | | Proposed changes to PR template (develop as base branch, exclude build and ↵ | Albin Larsson | 2018-05-30 | 1 | -5/+5 |
|/ / / | | | | | | | | | | typo fix) | ||||
* | | | Merge pull request #981 from friday/hls-captions | Sam Potts | 2018-05-30 | 6 | -78/+55 |
|\ \ \ | | | | | | | | | Improve captions handling for streaming | ||||
| * | | | Update readme.md | Sam Potts | 2018-05-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Defer initial captions update to next tick, to avoid event being triggered ↵ | Albin Larsson | 2018-05-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | to early | ||||
| * | | | Change to using addtrack and removetrack listeners since 'change' didn't ↵ | Albin Larsson | 2018-05-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | trigger in firefox for embedded captions (may also be a hls.js issue) | ||||
| * | | | Replace browser language detection in defaults.js with explicit 'auto' option | Albin Larsson | 2018-05-28 | 3 | -3/+7 |
| | | | | |||||
| * | | | Fix typo | Albin Larsson | 2018-05-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Ensure language is set in case the track is added after initialization, and ↵ | Albin Larsson | 2018-05-28 | 2 | -17/+9 |
| | | | | | | | | | | | | | | | | trigger languagechange event when language is initially set | ||||
| * | | | Add option to watch caption track changes and update language options | Albin Larsson | 2018-05-28 | 3 | -1/+9 |
| | | | | |||||
| * | | | Optimize captions code reused and ensure captionsenabled/captionsdisabled | Albin Larsson | 2018-05-28 | 3 | -59/+32 |
| | | | | | | | | | | | | | | | | will be sent on initial setup |