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

643 Commits

Author SHA1 Message Date
Sam Potts
aae1092bac Merge branch 'develop' of github.com:sampotts/plyr into develop 
# 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
 2018-06-13 00:41:30 +10:00
Sam Potts
392dfd024c Utils broken down into seperate files and exports 2018-06-13 00:02:55 +10:00
cky
87170ab460 remove event listeners in destroy, add once method 2018-06-12 21:18:05 +08:00
Sam Potts
0b09b8ee6f
Merge pull request #1027 from friday/quality 
Minor code improvements for quality switching
 2018-06-12 11:13:34 +10:00
Albin Larsson
6d2dad5810 Trigger qualityrequested event unconditionally when trying to set it (needed for streaming libraries to be able to listen) 2018-06-12 02:31:18 +02:00
Sam Potts
6a6f3914c0 Merge branch 'develop' into a11y-improvements 
# 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
 2018-06-11 17:13:09 +10:00
Sam Potts
840e31a693 v3.3.12 2018-06-11 17:10:37 +10:00
Sam Potts
3fad6ed42c Merge branch 'develop' into a11y-improvements 
# 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
 2018-06-11 16:54:20 +10:00
Sam Potts
38f954ef17 Merge branch 'master' into develop 
# 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
 2018-06-11 16:48:54 +10:00
Sam Potts
efe70ab48e v3.3.11 2018-06-11 16:39:35 +10:00
Albin Larsson
62c263bda3 Replace quality setter conditions with Array.find() 2018-06-11 08:23:08 +02:00
Sam Potts
38f10d4cc6 WIP 2018-06-11 16:19:11 +10:00
Albin Larsson
37a3ab202a Remove wrapper function around utils.is.element in Plyr.setup() (no lnger needed) 2018-06-11 05:44:57 +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
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
Sam Potts
7c6d4666e9 Merge branch 'develop' into a11y-improvements 
# 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
 2018-06-09 17:03:16 +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
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
 2018-05-31 23:43:40 +10:00
Sam Potts
969a877a34 v3.3.10 2018-05-31 23:41:48 +10:00
Philip Giuliani
8de06fb862 Accept quality 0 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
Albin Larsson
7aad747c25 Optimize captions code reused and ensure captionsenabled/captionsdisabled 
will be sent on initial setup
 2018-05-28 05:44:54 +02:00
Sam Potts
69bb0917ad v3.3.9 2018-05-28 10:41:51 +10:00
Sam Potts
90c5735904 WIP 2018-05-28 10:19:07 +10:00
Albin Larsson
fac8a185ba Simplify currentTime setter and bail when media hasn't loaded 2018-05-28 00:57:07 +02:00
Albin Larsson
c69aa8a42b Avoid duration getter returning NaN before element has loaded 2018-05-28 00:57:01 +02:00
Sam Potts
cd51788b98 v3.3.8 2018-05-26 13:53:15 +10:00
Sam Potts
55bbf64f2b
Merge pull request #963 from friday/verify-poster 
Make sure poster element isn't shown if the image isn't loaded
 2018-05-19 11:27:52 +10:00
Albin Larsson
37c5fbfe16 toggleControls() rewrite 2018-05-18 16:19:38 +02:00
Albin Larsson
16c3a7d9e5 Rewrite ui.setPoster to check that images arent broken or youtube fallback images. Only show poster element when valid 2018-05-15 16:21:36 +02:00
Albin Larsson
7ca2169790 Expose defaults (enable overriding) 2018-05-14 06:49:04 +02:00
Sam Potts
33a11fb53a v3.3.7 2018-05-09 09:50:22 +10:00
Sam Potts
f687b81b70 v3.3.6 2018-05-08 13:18:30 +10:00
Sam Potts
1491b017a0 Setup multiple players 2018-05-06 16:18:10 +10:00
Sam Potts
1655150092 v3.3.5 2018-05-06 01:32:51 +10:00
Sam Potts
ceb6c9a100 v3.3.3 2018-05-06 01:16:41 +10:00
Sam Potts
91a4b86860 Small bug fixes 2018-05-06 01:03:38 +10:00
Sam Potts
9ebc2719d3 v3.3.0 2018-05-06 00:49:12 +10:00
Albin Larsson
9e19b526b9 Only add hideControls class if config.hideControls is truthy 2018-04-26 17:51:14 +02:00
Sam Potts
a812650fea v3.2.4 2018-04-27 00:47:51 +10:00
Sam Potts
fec7a77d6f v3.2.3 2018-04-25 20:02:36 +10:00
Sam Potts
27407ba021 v3.2.2 2018-04-25 19:46:39 +10:00
Sam Potts
f1b275aedc v3.2.1 2018-04-23 00:53:54 +10:00
Sam Potts
5b39986835 Merge branch 'master' of github.com:sampotts/plyr 2018-04-18 18:29:50 +10:00
Sam Potts
a97b08e8ea ARIA and Vimeo fixes 2018-04-18 18:29:43 +10:00
Albin Larsson
6d79b8cd4c Don't require captions toggle button to be enabled in order to show captions 2018-04-17 18:59:19 +02:00
Sam Potts
88d766aeae v3.2.0 2018-04-17 23:54:38 +10:00
Sam Potts
119b471b84 More bug fixes 2018-04-17 23:51:23 +10:00
Sam Potts
7f079e0ec3 Fix for playing false positive (fixes #898) 2018-04-17 22:52:46 +10:00
Sam Potts
46fe3eecff Fixed bug for captions with no srclang and labels and improved logic (fixes #875) 2018-04-17 22:49:28 +10:00