Commit Graph

488 Commits

Author SHA1 Message Date
Sam Potts b18ed03384 WIP on captions bug, manual duration option, reset media object 2016-02-21 13:17:30 +11:00
Sam Potts 6a0b3dc823 Merge pull request #168 from gurupras/fix-captions
Fixes for captions
2016-02-21 11:28:15 +11:00
Guru Prasad Srinivasa 402c45ee2b Updated manual caption split pattern
Previously, Plyr was using a fixed pattern of '\n\n' to split
contents into captions. This does not always work as some VTT files
contain '\r\n'. This commit checks for both.
2016-02-16 20:17:10 -05:00
Guru Prasad Srinivasa 67f19166ac Some WebVTT fixes to allow manual captions
WebVTT allows additional parameters along with the line that
contains the start and end times. These were not being filtered
out while attempting to manually display captions.
2016-02-16 19:52:08 -05:00
Sam Potts 32b7b6b886 Merge pull request #167 from ivanvermeyen/patch-1
Allow player control colors to be overridden #158
2016-02-15 11:50:38 +11:00
Sam Potts 96df8fbc85 Update readme.md 2016-02-14 14:04:30 +11:00
Sam Potts e742527e65 Version bump 2016-02-13 22:23:11 +11:00
Sam Potts f426af6e9e 1.5.11 v1.5.11 2016-02-13 22:19:48 +11:00
Sam Potts aea86b6124 Merge branch 'master' of github.com:selz/plyr
# Conflicts:
#	dist/plyr.js
2016-02-13 22:19:31 +11:00
Sam Potts ce51344269 iOS fix (Fixes #166), Edge Progress Tip (Fixes #160), SASS fix (Fixes #158) 2016-02-13 22:18:42 +11:00
Ivan Vermeyen 7d0311fd64 Allow player control colors to be overridden #158 2016-02-12 17:11:07 +01:00
Sam Potts 89e000f669 Update readme.md 2016-02-09 14:53:57 +11:00
Sam Potts f341f1264d Update readme.md 2016-02-09 14:53:20 +11:00
Sam Potts c687b867e7 Update readme.md 2016-02-09 14:52:37 +11:00
Sam Potts 4ee31ba661 Update readme.md 2016-02-09 14:40:26 +11:00
Sam Potts a9126a4c82 Update readme.md 2016-02-05 00:02:24 +11:00
Sam Potts 6b70c4b49a Update readme.md 2016-02-04 14:59:59 +11:00
Sam Potts d8fb876c81 Update readme.md 2016-02-04 14:58:00 +11:00
Sam Potts 73e6ad610f Merge pull request #156 from mortonfox/patch-1
Fix the svgfixer.js link
2016-02-02 09:35:31 +11:00
Morton Fox eee7553d09 Fix the svgfixer.js link 2016-02-01 16:14:22 -05:00
Sam Potts 130b5ebedf Update readme.md 2016-01-29 10:25:39 +11:00
Sam Potts dae5fb9785 Merge pull request #154 from marvinhagemeister/fix_window_usage
Get the proper reference to window on initialization.
2016-01-28 09:19:25 +11:00
Marvin Hagemeister 31a0eb8d14 Get the proper window reference on initialization.
The previous code assumed that `this` points to the browsers
window object, which is not the case when using a module bundler.

So we check for the variable `window` first, before falling back
to `this`.

(taken from jQuery's codebase)
2016-01-27 21:27:58 +01:00
Sam Potts b8b611fbb6 Merge pull request #152 from marvinhagemeister/fix_commonjs
Swap CommonJS and AMD module check so that CommonJS is checked first
2016-01-27 08:45:10 +11:00
Marvin Hagemeister a285fcc4ec Check for module.exports as well for CommonJS Modules 2016-01-26 17:05:57 +01:00
Marvin Hagemeister 4fda65c862 Swap CommonJS and AMD module check so that CommonJS is checked first. Fixes Webpack module bundling 2016-01-26 16:53:15 +01:00
Sam Potts a8cea7b5c9 1.5.10 v1.5.10 2016-01-26 22:44:09 +11:00
Sam Potts 01bdcc2b01 Merge pull request #151 from marvinhagemeister/fix_npm
Fix broken npm require/import
2016-01-26 20:44:44 +11:00
Marvin Hagemeister 812d2d33f2 NPM package main must always be the main source file. Fixes broken require/import 2016-01-26 10:21:03 +01:00
Sam Potts a59073c5ca Update readme.md 2016-01-26 10:16:02 +11:00
Sam Potts 7edc3ccd53 NPM updates and published (fixes #146) 2016-01-26 10:08:19 +11:00
Sam Potts b217e23880 Npm changes v1.5.9 2016-01-26 09:59:17 +11:00
Sam Potts 053b6c2e3f Merge pull request #150 from marvinhagemeister/remove_global
Remove global preinstall script
2016-01-26 09:33:49 +11:00
Marvin Hagemeister 0d426ca479 Remove global preinstall script. Gulp does not have to be globally installed to build plyr 2016-01-25 16:35:54 +01:00
Sam Potts a327056789 Seek fixes for touch v1.5.8 2016-01-25 11:25:32 +11:00
Sam Potts b006b73c69 Fix for control tooltips always showing v1.5.7 2016-01-25 11:02:35 +11:00
Sam Potts 3127cea1b2 SASS fix (fixes #149) 2016-01-25 08:36:53 +11:00
Sam Potts a965d8a893 Seek tooltip, bug fixes for SASS, fullscreen and icons v1.5.6 2016-01-24 11:25:31 +11:00
Sam Potts 173e651e3f Comment 2016-01-23 12:24:58 +11:00
Sam Potts fa5cb828c0 Update controls.md 2016-01-21 09:49:00 +11:00
Sam Potts 5978810b7f Update controls.md 2016-01-21 09:48:46 +11:00
Sam Potts 6c251794c8 Merge branch 'master' of github.com:selz/plyr v1.5.5 2016-01-21 09:43:40 +11:00
Sam Potts 76917751e3 Small bug fixes 2016-01-21 09:43:27 +11:00
Sam Potts e75a9b89b0 Merge pull request #147 from christianpv/patch-3
Update bundles.json - Fix path to sass dir.
2016-01-21 09:06:08 +11:00
Christian Pena a0fe61011f Update bundles.json - Fix path to sass dir. 2016-01-20 12:40:04 -05:00
Sam Potts 84a1b03d7d Docs update 2016-01-19 17:15:50 +11:00
Sam Potts b9177e7892 Minor bug fix for clicking video to play/pause after source change v1.5.4 2016-01-19 11:36:30 +11:00
Sam Potts fd12247a62 Fix for video click 2016-01-19 11:34:04 +11:00
Sam Potts 20a71300a5 Controls 2016-01-19 09:54:23 +11:00
Sam Potts 70c5b24678 Added reference 2016-01-19 09:35:10 +11:00