aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1015 from friday/captions-fixes-againSam Potts2018-06-119-199/+214
|\ | | | | Captions rewrite (use index internally to support missing or duplicate languages)
| * TypoAlbin Larsson2018-06-101-2/+2
| |
| * Fix #1017, fix #980, fix #1014: Captions rewrite (use index internally)Albin Larsson2018-06-105-137/+159
| |
| * controls.createMenuItem: Change input to object (too many params made it ↵Albin Larsson2018-06-101-13/+21
| | | | | | | | hard to read)
| * Avoid condition in getTracksAlbin Larsson2018-06-101-7/+4
| |
| * Change debug warn 'Unsupported language option' to log 'Language option ↵Albin Larsson2018-06-101-1/+1
| | | | | | | | doesn't yet exist' since it doesn't have to be an error
| * Fix #1003: Formatted captions issueAlbin Larsson2018-06-103-2/+3
| |
| * Merge captions setText and setCue into updateCues (fixes #998 and vimeo ↵Albin Larsson2018-06-084-57/+44
| | | | | | | | cuechange event)
* | Merge pull request #1020 from friday/1016Sam Potts2018-06-111-0/+8
|\ \ | | | | | | Vimeo: Update playback state and assure events are triggered on load
| * | Vimeo: Assure state is updated with autoplay (fixes #1016)Albin Larsson2018-06-111-0/+8
| | |
* | | Merge pull request #1021 from friday/vimeo-seek-while-playingSam Potts2018-06-112-4/+11
|\ \ \ | |/ / |/| | Fix for YouTube and Vimeo pausing after seek
| * | Fix problem with YouTube and Vimeo seeking while playingAlbin Larsson2018-06-112-4/+11
|/ /
* | Restore defaultSam Potts2018-06-099-9/+8
| |
* | Fix Sprite issueSam Potts2018-06-0914-51/+58
|/
* Merge pull request #1007 from cky917/masterSam Potts2018-06-0816-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 ↵cky2018-06-061-0/+6
| | | | | | | | can't make the video pause, because after 'keyup', it always make the video play
| * fix: https://github.com/sampotts/plyr/issues/1006cky2018-06-061-1/+4
| |
| * Update controls.md (fixes #996)Sam Potts2018-06-021-5/+3
| |
| * Merge branch 'master' of github.com:sampotts/plyrSam Potts2018-05-3126-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/developSam Potts2018-05-3126-1926/+614
| | |\ | |_|/ |/| | v3.3.10
* | | Fixed incorrect BEM formatting, fixed buffer alignmentSam Potts2018-05-3114-1581/+299
| | |
* | | Merge pull request #988 from kim-company/translate-qualitiesSam Potts2018-05-3114-273/+243
|\ \ \ | | | | | | | | Translate quality badges and quality names
| * | | Rename qualityName to labelPhilip Giuliani2018-05-311-3/+3
| | | |
| * | | Refactor getDeep methodPhilip Giuliani2018-05-301-1/+1
| | | |
| * | | Return undefined when the key is not present.Philip Giuliani2018-05-309-14/+14
| | | |
| * | | RebuildPhilip Giuliani2018-05-308-172/+149
| | | |
| * | | RebuildPhilip Giuliani2018-05-304-6/+12
| | | |
| * | | Add getDeep method to utilsPhilip Giuliani2018-05-302-1/+6
| | | |
| * | | RebuildPhilip Giuliani2018-05-308-87/+71
| | | |
| * | | Implement translation support for qualityName and qualityBadgePhilip Giuliani2018-05-302-23/+16
| | | |
| * | | Allow nested translationsPhilip Giuliani2018-05-301-2/+6
| | | |
| * | | Accept quality 0Philip Giuliani2018-05-301-1/+1
| | | |
| * | | ESLint tweakSam Potts2018-05-301-0/+1
| | | |
* | | | Merge pull request #990 from friday/travisSam Potts2018-05-313-1/+15
|\ \ \ \ | | | | | | | | | | Travis integration
| * | | | Lint and build in travisAlbin Larsson2018-05-301-0/+7
| | | | |
| * | | | Add npm scripts for linting and buildingAlbin Larsson2018-05-301-0/+2
| | | | |
| * | | | Gulp: Add option to build onlyAlbin Larsson2018-05-301-1/+6
| |/ / /
* | | | Merge pull request #992 from philipgiuliani/quality-resume-timeSam Potts2018-05-311-3/+7
|\ \ \ \ | | | | | | | | | | Wait for the metadata to be loaded before setting the currentTime
| * | | | Wait for the metadata to be loaded before setting the currentTimePhilip Giuliani2018-05-311-3/+7
|/ / / /
* | | | Merge pull request #989 from friday/pr-templateSam Potts2018-05-311-5/+5
|\ \ \ \ | |/ / / |/| | | Proposed changes to PR template
| * | | Proposed changes to PR template (develop as base branch, exclude build and ↵Albin Larsson2018-05-301-5/+5
|/ / / | | | | | | | | | typo fix)
* | | Merge pull request #981 from friday/hls-captionsSam Potts2018-05-306-78/+55
|\ \ \ | | | | | | | | Improve captions handling for streaming
| * | | Update readme.mdSam Potts2018-05-301-1/+1
| | | |
| * | | Defer initial captions update to next tick, to avoid event being triggered ↵Albin Larsson2018-05-281-2/+2
| | | | | | | | | | | | | | | | to early
| * | | Change to using addtrack and removetrack listeners since 'change' didn't ↵Albin Larsson2018-05-281-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' optionAlbin Larsson2018-05-283-3/+7
| | | |
| * | | Fix typoAlbin Larsson2018-05-281-1/+1
| | | |
| * | | Ensure language is set in case the track is added after initialization, and ↵Albin Larsson2018-05-282-17/+9
| | | | | | | | | | | | | | | | trigger languagechange event when language is initially set
| * | | Add option to watch caption track changes and update language optionsAlbin Larsson2018-05-283-1/+9
| | | |
| * | | Optimize captions code reused and ensure captionsenabled/captionsdisabledAlbin Larsson2018-05-283-59/+32
| | | | | | | | | | | | | | | | will be sent on initial setup