aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'develop' of github.com:sampotts/plyr into developSam Potts2018-06-1311-245/+190
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/js/captions.js # src/js/controls.js # src/js/fullscreen.js # src/js/html5.js # src/js/listeners.js # src/js/plugins/youtube.js # src/js/plyr.js # src/js/utils.js
| | * \ Merge pull request #1029 from cky917/developSam Potts2018-06-137-53/+72
| | |\ \ | | | | | | | | | | remove event listeners in destroy()
| | | * | remove event listeners in destroy, add once methodcky2018-06-127-53/+72
| | | | |
| | * | | fix: html5.cancelRequest not remove source tag correctlyBoHong Li2018-06-121-1/+1
| | |/ /
| | * | Merge pull request #1027 from friday/qualitySam Potts2018-06-124-134/+56
| | |\ \ | | | | | | | | | | Minor code improvements for quality switching
| | | * | Move uniqueness filter from getQualityOptions to setQualityMenuAlbin Larsson2018-06-122-6/+4
| | | | |
| | | * | Trigger qualityrequested event unconditionally when trying to set it (needed ↵Albin Larsson2018-06-123-14/+4
| | | | | | | | | | | | | | | | | | | | for streaming libraries to be able to listen)
| | | * | Remove todo comment about Vimeo support for setting quality (they don't ↵Albin Larsson2018-06-121-1/+0
| | | | | | | | | | | | | | | | | | | | support it)
| | | * | Filter out unsupported mimetypes in getSources() instead of the quality setterAlbin Larsson2018-06-121-9/+9
| | | | |
| | | * | Simplify logic in youtube.mapQualityUnit (not that it matters much now)Albin Larsson2018-06-121-45/+19
| | | | |
| | | * | Replace quality setter conditions with Array.find()Albin Larsson2018-06-111-21/+13
| | | | |
| | | * | Assure type safety in getSources() and getQualityOptions() (always return ↵Albin Larsson2018-06-111-42/+11
| | | | | | | | | | | | | | | | | | | | arrays), and remove external conditions and type conversion no longer needed
| * | | | Utils broken down into seperate files and exportsSam Potts2018-06-1332-1463/+1530
| |/ / /
* | | | Merge branch 'develop' into a11y-improvementsSam Potts2018-06-113-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # 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
| * | | v3.3.12Sam Potts2018-06-113-3/+3
| | | |
* | | | Merge branch 'develop' into a11y-improvementsSam Potts2018-06-1110-233/+263
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 # src/js/captions.js
| * | | Merge branch 'master' into developSam Potts2018-06-113-3/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # 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
| | * | v3.3.11Sam Potts2018-06-113-3/+3
| | | |
| * | | Fix synthetic event bubble/proxy loses detailAlbin Larsson2018-06-111-1/+1
| | | |
| * | | Remove wrapper function around utils.is.element in Plyr.setup() (no lnger ↵Albin Larsson2018-06-111-1/+1
| | | | | | | | | | | | | | | | needed)
| * | | Avoid using this to refer to utils or utils.is, since that means methods ↵Albin Larsson2018-06-111-17/+17
| | | | | | | | | | | | | | | | can't be used statically
| * | | Move utils.is.getConstructor() to utils.getConstructor()Albin Larsson2018-06-111-9/+10
| | | |
| * | | Merge pull request #1015 from friday/captions-fixes-againSam Potts2018-06-118-198/+212
| |\ \ \ | | | | | | | | | | Captions rewrite (use index internally to support missing or duplicate languages)
| | * | | Fix #1017, fix #980, fix #1014: Captions rewrite (use index internally)Albin Larsson2018-06-104-136/+157
| | | | |
| | * | | 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
| | | | | |
| * | | | | Fix problem with YouTube and Vimeo seeking while playingAlbin Larsson2018-06-112-4/+11
| |/ / / /
* | | | | WIPSam Potts2018-06-114-31/+59
| | | | |
* | | | | Merge branch 'develop' into a11y-improvementsSam Potts2018-06-0913-157/+151
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 # dist/plyr.polyfilled.js.map # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map # src/js/captions.js # src/js/plyr.js
| * | | | Fix Sprite issueSam Potts2018-06-091-13/+11
| |/ / /
| * | | 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
| |/ /
| * | Merge branch 'master' of github.com:sampotts/plyrSam Potts2018-05-3110-124/+116
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * | Fixed incorrect BEM formatting, fixed buffer alignmentSam Potts2018-05-313-18/+21
| | | |
| | * | Merge pull request #988 from kim-company/translate-qualitiesSam Potts2018-05-315-26/+28
| | |\ \ | | | | | | | | | | 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-301-2/+2
| | | | |
| | | * | Add getDeep method to utilsPhilip Giuliani2018-05-302-1/+6
| | | | |
| | | * | 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
| | | | |
| | * | | Wait for the metadata to be loaded before setting the currentTimePhilip Giuliani2018-05-311-3/+7
| | |/ /
| | * | Merge pull request #981 from friday/hls-captionsSam Potts2018-05-305-77/+54
| | |\ \ | | | | | | | | | | Improve captions handling for streaming
| | | * | Defer initial captions update to next tick, to avoid event being triggered ↵Albin Larsson2018-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | to early