proxima.entertainment/plyr
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,402 Commits 7 Branches 235 Tags
599883e684cf72a631ea366d0cb821fcb1c3d013
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Potts 599883e684 Formatting fix 2018-06-17 01:30:24 +10:00
Sam Potts f1b4db4f36 Merge branch 'develop' into a11y-improvements 
# Conflicts:
#	dist/plyr.js
#	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/controls.js
#	src/js/fullscreen.js
#	src/js/plyr.js
#	src/js/ui.js
#	src/js/utils.js
 2018-06-17 01:26:24 +10:00
Sam Potts d4abb4b143 120 line width, package upgrade 2018-06-17 01:04:55 +10:00
Sam Potts 828ce66942 Merge pull request #1038 from friday/captions-input-lowercase 
Small captions fixes
 2018-06-17 00:40:56 +10:00
Sam Potts ccc2608cf6 Merge pull request #1039 from friday/poster-race-conditions 
Fix poster race conditions
 2018-06-17 00:40:28 +10:00
Sam Potts de45de0e0b Merge pull request #1040 from friday/switches-get-stitches 
Switches code optimizations
 2018-06-17 00:39:35 +10:00
Sam Potts d522e40594 Merge pull request #1034 from friday/remove-array-newline-rule 
Suggestion: Remove array newline rule
 2018-06-15 15:34:29 +10:00
Sam Potts 3cd2b9a6c3 Merge pull request #1036 from friday/captions-passive-toggle 
Captions fixes (again)
 2018-06-15 15:33:39 +10:00
Sam Potts 019e1f80ca Merge pull request #1032 from friday/event-2 
Fix condition in events.toggleListener to allow non-elements
 2018-06-13 23:16:46 +10:00
Sam Potts 5c08363400 Merge pull request #1030 from friday/event-improvements 
Minor event changes
 2018-06-13 10:52:17 +10:00
Sam Potts 5dddf8b0ec Logic cleanup 2018-06-13 00:56:31 +10:00
Sam Potts 0ecf7e3854 Force string on format 2018-06-13 00:48:42 +10:00
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 7158e507ad Merge pull request #1029 from cky917/develop 
remove event listeners in destroy()
 2018-06-13 00:05:31 +10:00
Sam Potts 70f3390ffe Merge pull request #1028 from a60814billy/fix/cancel-request-not-remove-source-tag-correctly 
fix: html5.cancelRequest not remove source tag correctly
 2018-06-13 00:03:24 +10:00
Sam Potts 392dfd024c Utils broken down into seperate files and exports 2018-06-13 00:02:55 +10: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
Sam Potts cd14c3086d Merge pull request #1025 from azu/patch-1 
Fix markdown in README
 2018-06-11 20:16:18 +10: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 1bc452c349 Merge 2018-06-11 16:54:35 +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 abd1182303 Merge 2018-06-11 16:45:40 +10:00
Sam Potts efe70ab48e v3.3.11 2018-06-11 16:39:35 +10:00
Sam Potts 38f10d4cc6 WIP 2018-06-11 16:19:11 +10:00
Sam Potts 1ad76800b0 Merge pull request #1024 from friday/event-bubble-detail 
Event "detail" is lost in the synthetic event bubble/proxy
 2018-06-11 16:13:02 +10:00
Sam Potts f951cb372c Merge pull request #1023 from friday/make-utils-static 
Make utils static
 2018-06-11 14:41:06 +10:00
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
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
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
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
Sam Potts 1e1874d86b Merge pull request #1009 from friday/contributing 
Contributing document and codepen demo updates
 2018-06-08 10:52:37 +10: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
 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
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
Sam Potts 25a319d884 Merge pull request #989 from friday/pr-template 
Proposed changes to PR template
 2018-05-31 08:34:02 +10: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
Sam Potts d70a787af1 Merge branch 'develop' 2018-05-28 10:42:11 +10: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
Sam Potts 6f256d09b2 ESLint tweak 2018-05-28 10:18:04 +10:00
Sam Potts e9684c2021 Merge pull request #979 from friday/respect-storage 
Respect storage being disabled for storage getter
 2018-05-28 10:09:02 +10:00
Sam Potts bf91a0e73f Merge pull request #977 from friday/utils.is.icue-ie11 
Restore utils.is.cue()
 2018-05-28 10:08:42 +10:00
Sam Potts 14b6309aef Merge pull request #978 from friday/ie-issues 
Fix InvalidStateError and IE11 issues
 2018-05-28 10:08:24 +10:00
Sam Potts f0be913dc3 Merge pull request #975 from sampotts/develop 
v3.3.8
 2018-05-26 13:55:22 +10:00
Sam Potts cd51788b98 v3.3.8 2018-05-26 13:53:15 +10:00
Sam Potts edd67b0da3 Typo 2018-05-20 23:44:40 +10:00
Sam Potts d733454d7f Pause while seeking 2018-05-20 23:40:28 +10:00
Sam Potts 41f9a87e0e Add URL polyfill 2018-05-20 23:40:00 +10:00
Sam Potts f4858f0c62 Merge pull request #959 from friday/876 
Youtube and vimeo fixes
 2018-05-19 16:49:31 +10:00
Sam Potts 3ab2295fe7 Merge branch 'master' into develop 2018-05-19 11:29:47 +10:00
Sam Potts c41bb657ac Merge pull request #958 from friday/954 
Fix the seek tooltip time difference from seek time
 2018-05-19 11:28:38 +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
Sam Potts 3bba65f2c2 Merge pull request #967 from friday/883 
toggleControls rewrite
 2018-05-19 11:27:19 +10:00
Sam Potts 1bab0d07b5 Merge branch 'master' into develop 2018-05-19 11:26:05 +10:00
Sam Potts 602353f4d9 Merge branch 'master' of github.com:sampotts/plyr 2018-05-19 11:25:02 +10:00
Sam Potts 51814249af Reduce circular dependencies 2018-05-19 11:24:56 +10:00
Sam Potts 797b70998f Merge pull request #960 from friday/935 
Support importing Plyr in Node.js without errors
 2018-05-14 23:38:48 +10:00
Sam Potts 4a01027da0 Merge pull request #961 from friday/expose-defaults 
Enable overriding defaults
 2018-05-14 23:38:25 +10:00
Sam Potts 765c01e83d Remove references to window.Plyr 2018-05-10 09:34:15 +10:00
Sam Potts 33a11fb53a v3.3.7 2018-05-09 09:50:22 +10:00
Sam Potts d1d41ca49a Merge branch 'master' of github.com:sampotts/plyr 2018-05-09 09:48:52 +10:00
Sam Potts c06e0ee5e9 Grid tweak 2018-05-09 09:48:46 +10:00
Sam Potts 83f80ccc40 Merge pull request #950 from friday/poster-fixes 
Poster fixes
 2018-05-09 09:44:36 +10:00
Sam Potts 34401de3d0 Merge branch 'master' into develop 2018-05-08 22:22:43 +10:00
Sam Potts f687b81b70 v3.3.6 2018-05-08 13:18:30 +10:00
Sam Potts bbb11e611e Vimeo options, docs for multiple players 2018-05-08 13:12:39 +10:00
Sam Potts 90919411e9 Use div for poster, Vimeo fixes, Tooltip fixes 2018-05-08 12:57:24 +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 00bbce08fb Reverted menu change 2018-05-06 01:14:41 +10:00
Sam Potts 91a4b86860 Small bug fixes 2018-05-06 01:03:38 +10:00
Sam Potts 5aece6fa06 Merge 2018-05-06 00:50:02 +10:00
Sam Potts a70b94afe2 Merge branch 'master' of github.com:sampotts/plyr 2018-05-06 00:49:22 +10:00
Sam Potts 9ebc2719d3 v3.3.0 2018-05-06 00:49:12 +10:00
Sam Potts b46aae1833 Merge pull request #939 from Billybobbonnet/patch-1 
Added 480p to SD labels
 2018-05-03 20:28:03 +10:00
Sam Potts 403df36af6 Merge branch 'master' into develop 2018-04-27 21:42:29 +10:00
Sam Potts 5ca769807e Merge pull request #923 from friday/922 
Only add hideControls class if config.hideControls is truthy
 2018-04-27 20:07:18 +10:00
Sam Potts 72a71a605b Fix for default timestamp 2018-04-27 20:06:14 +10:00
Sam Potts 24d833a5d1 Merge branch 'master' into develop 2018-04-27 18:35:06 +10:00
Sam Potts 44b30380f7 Merge branch 'beta' of github.com:Selz/plyr 2018-04-27 18:34:06 +10:00
Sam Potts 261cd086c7 Update readme.md 2018-04-27 12:44:58 +10:00
Sam Potts 6c617a0ef1 Readme fix 2018-04-27 01:12:04 +10: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 971e261067 Fix for iOS 9 throwing error for name property in fullscreen API (fixes #908) 2018-04-25 19:59:22 +10:00
Sam Potts 27407ba021 v3.2.2 2018-04-25 19:46:39 +10:00