ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,327 Commits 7 Branches 235 Tags
Commit Graph

1327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Potts
7d26f41d64
Merge pull request #1015 from friday/captions-fixes-again 
Captions rewrite (use index internally to support missing or duplicate languages)
 2018-06-11 13:21:05 +10:00
Sam Potts
f37f465ce4
Merge pull request #1020 from friday/1016 
Vimeo: Update playback state and assure events are triggered on load
 2018-06-11 11:48:03 +10:00
Sam Potts
b199215525
Merge pull request #1021 from friday/vimeo-seek-while-playing 
Fix for YouTube and Vimeo pausing after seek
 2018-06-11 11:47:34 +10:00
Albin Larsson
94699f3255 Fix problem with YouTube and Vimeo seeking while playing 2018-06-11 02:21:00 +02:00
Albin Larsson
d3e98eb27e Vimeo: Assure state is updated with autoplay (fixes #1016) 2018-06-11 00:00:16 +02:00
Albin Larsson
41012a9843 Typo 2018-06-10 22:00:15 +02:00
Albin Larsson
c83487a293 Fix #1017, fix #980, fix #1014: Captions rewrite (use index internally) 2018-06-10 19:00:07 +02:00
Albin Larsson
1fab4919c0 controls.createMenuItem: Change input to object (too many params made it hard to read) 2018-06-10 18:57:19 +02:00
Albin Larsson
9dc0f28800 Avoid condition in getTracks 2018-06-10 18:57:19 +02:00
Albin Larsson
b57784d1a5 Change debug warn 'Unsupported language option' to log 'Language option doesn't yet exist' since it doesn't have to be an error 2018-06-10 18:56:13 +02:00
Albin Larsson
a80b31bf98 Fix #1003: Formatted captions issue 2018-06-10 18:56:13 +02:00
Sam Potts
76bb299c68 Restore default 2018-06-09 12:05:37 +10:00
Sam Potts
0c03accd41 Fix Sprite issue 2018-06-09 12:04:53 +10:00
Albin Larsson
b12eeb0eb7 Merge captions setText and setCue into updateCues (fixes #998 and vimeo cuechange event) 2018-06-08 11:44:15 +02:00
Sam Potts
8e634862ff
Merge pull request #1007 from cky917/master 
fix:  After clicking on the progress bar, keyboard operations will not work.
 2018-06-08 10:54:16 +10:00
cky
84424f7f67 fix: when the seek input is focused and the video is playing, the space key can't make the video pause, because after 'keyup', it always make the video play 2018-06-06 19:27:07 +08:00
cky
c95d9923f7 fix: https://github.com/sampotts/plyr/issues/1006 2018-06-06 16:59:42 +08:00
Sam Potts
05b85da3f4
Update controls.md (fixes #996) 2018-06-02 19:48:48 +10:00
Sam Potts
a4caba120c Merge branch 'master' of github.com:sampotts/plyr 
# 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
v3.3.10 		2018-05-31 23:43:40 +10:00
Sam Potts
969a877a34 v3.3.10 2018-05-31 23:41:48 +10:00
Sam Potts
fb22a90d33
Merge pull request #993 from sampotts/develop 
v3.3.10
 2018-05-31 23:39:51 +10:00
Sam Potts
108bd3dfa0 Fixed incorrect BEM formatting, fixed buffer alignment 2018-05-31 23:33:59 +10:00
Sam Potts
5a445ae647
Merge pull request #988 from kim-company/translate-qualities 
Translate quality badges and quality names
 2018-05-31 22:43:31 +10:00
Philip Giuliani
56668f58b6 Rename qualityName to label 2018-05-31 14:40:56 +02:00
Sam Potts
eec96e5879
Merge pull request #990 from friday/travis 
Travis integration
 2018-05-31 18:33:00 +10:00
Sam Potts
c6c9d877e4
Merge pull request #992 from philipgiuliani/quality-resume-time 
Wait for the metadata to be loaded before setting the currentTime
 2018-05-31 18:32:10 +10:00
Philip Giuliani
61f4b998e1 Wait for the metadata to be loaded before setting the currentTime 2018-05-31 10:17:41 +02:00
Sam Potts
25a319d884
Merge pull request #989 from friday/pr-template 
Proposed changes to PR template
 2018-05-31 08:34:02 +10:00
Albin Larsson
4bf678fe6c Proposed changes to PR template (develop as base branch, exclude build and typo fix) 2018-05-30 19:52:15 +02:00
Albin Larsson
359acd6bb9 Lint and build in travis 2018-05-30 19:40:17 +02:00
Albin Larsson
2fce385691 Add npm scripts for linting and building 2018-05-30 19:40:17 +02:00
Albin Larsson
a82c61c539 Gulp: Add option to build only 2018-05-30 19:39:57 +02:00
Philip Giuliani
a8fa125a96 Refactor getDeep method 2018-05-30 17:30:10 +02:00
Philip Giuliani
6435ced707 Return undefined when the key is not present. 2018-05-30 17:10:38 +02:00
Philip Giuliani
94dc0d176c Rebuild 2018-05-30 17:03:41 +02:00
Philip Giuliani
23c21252e8 Rebuild 2018-05-30 17:02:07 +02:00
Philip Giuliani
41c7dff0e8 Add getDeep method to utils 2018-05-30 17:02:07 +02:00
Philip Giuliani
e3bae562fc Rebuild 2018-05-30 17:02:07 +02:00
Philip Giuliani
1c1668bfc3 Implement translation support for qualityName and qualityBadge 2018-05-30 17:02:07 +02:00
Philip Giuliani
e0c09c51f2 Allow nested translations 2018-05-30 17:02:07 +02:00
Philip Giuliani
8de06fb862 Accept quality 0 2018-05-30 17:02:07 +02:00
Sam Potts
64412868d8 ESLint tweak 2018-05-30 17:02:07 +02:00
Sam Potts
450958c290
Merge pull request #981 from friday/hls-captions 
Improve captions handling for streaming
 2018-05-30 21:44:42 +10:00
Sam Potts
963fe11ad6
Update readme.md 2018-05-30 00:22:01 +10:00
Sam Potts
ce199e4b6b
Merge pull request #986 from friday/701 
Call duration update method manually if user config has duration
 2018-05-30 00:20:15 +10:00
Albin Larsson
9d798893b5 Call duration update method manually if user config has duration 2018-05-29 16:06:07 +02:00
Albin Larsson
64399e0717 Defer initial captions update to next tick, to avoid event being triggered to early 2018-05-28 17:54:25 +02:00
Albin Larsson
f58e23b325 Change to using addtrack and removetrack listeners since 'change' didn't trigger in firefox for embedded captions (may also be a hls.js issue) 2018-05-28 16:19:44 +02:00
Albin Larsson
812e07b734 Replace browser language detection in defaults.js with explicit 'auto' option 2018-05-28 07:43:37 +02:00
Albin Larsson
c9298fde76 Fix typo 2018-05-28 07:08:38 +02:00