aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * Adsmanager is now re/pre-loaded with new ads when the video is done or an ad ↵Arthur Hulsman2018-01-171-116/+237
| | | | | | | | | | | | | | | | | | | | error appears. Will make it possible to request ads when a new video is loaded. Added comments and missing events within the adsmanagerloader method.
| | | | * Moved the ads container to be outside of the video wrapper. This way we can ↵Arthur Hulsman2018-01-172-4/+16
| | | | | | | | | | | | | | | | | | | | easily move the ad in front or behind the video controls based on content resume or pause IMA events.
| | | | * Moved the logic for pausing and playing the video to content pause/ resume ↵Arthur Hulsman2018-01-171-37/+27
| | | |/ | | | | | | | | | | | | IMA events to avoid flickering. Also used events for resolving the adsmanager and adsloader promises.
| | * | Merge branch 'beta' into beta-with-adsSam Potts2018-01-195-9/+9
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | # Conflicts: # demo/dist/demo.js # demo/dist/demo.js.map # dist/plyr.js # dist/plyr.js.map
| * | | Transition event fixSam Potts2018-01-199-13/+13
| | | |
| | * | Comments and formattingSam Potts2018-01-195-18/+43
| | |/
| | * Fix loading/playing of the ads when there is no valid ads.tagUrlferdiemmen2018-01-174-32/+20
| | |
| | * Some tweaksferdiemmen2018-01-167-82/+102
| | |
| | * fix blocking play() if ads are setferdiemmen2018-01-156-53/+53
| | |
| | * Merge pull request #761 from gehaktmolen/beta-with-ads-promisesFerdi2018-01-153-70/+221
| | |\ | | | | | | | | Beta with ads - Added promises, missing events, new ad tag and additional logging.
| | | * Added promises, missing events, new ad tag and additional logging.Arthur Hulsman2018-01-153-70/+221
| | |/
| | * TweaksSam Potts2018-01-142-6/+6
| | |
| | * Code tweaksSam Potts2018-01-1415-76/+71
| | |
| | * Merge branch 'beta' into beta-with-adsSam Potts2018-01-146-19/+9
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | # Conflicts: # demo/dist/demo.js # demo/dist/demo.js.map # dist/plyr.js # dist/plyr.js.map
| * | Minor logic tweakSam Potts2018-01-146-19/+9
| | |
| | * Fix loading google ima sdkferdiemmen2018-01-147-128/+17
| | |
| | * Implementing ads pluginferdiemmen2018-01-1312-5/+502
| |/
| * Progressively enhance <iframe> embedsSam Potts2018-01-1215-110/+204
| |
| * Publish script tweaksSam Potts2018-01-092-3/+16
| |
| * PackageSam Potts2018-01-092-1/+10
| |
| * Beta version up on https://plyr.io/beta and CDNSam Potts2018-01-0912-9052/+283
| |
| * Publishing to /betaSam Potts2018-01-096-287/+62
| |
| * Recommended extensions for VS CodeSam Potts2018-01-091-0/+12
| |
| * Styling tweaksSam Potts2018-01-0910-246/+293
| |
| * Use CSS custom property for webkit range fillSam Potts2018-01-088-36/+15
| |
| * Merge branch 'develop' of github.com:sampotts/plyr into developSam Potts2018-01-081-2/+6
| |\
| | * Merge pull request #752 from friday/gulp-fixSam Potts2018-01-081-2/+6
| | |\ | | | | | | | | Enable gulp builds when aws.json isn't present.
| | | * Fix gulp build for user who doesn't have aws.jsonAlbin Larsson2018-01-081-2/+6
| | |/
| * / Package tweaksSam Potts2018-01-088-577/+147
| |/
| * Empty storage fixSam Potts2018-01-075-5/+10
| |
| * Merge branch 'master' into developSam Potts2018-01-070-0/+0
| |\ | | | | | | | | | | | | # Conflicts: # src/js/plyr.js
| * \ Merge branch 'master' into developSam Potts2018-01-072-0/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .vscode/settings.json # demo/dist/demo.css # demo/dist/demo.js # demo/error.html # demo/index.html # demo/src/js/main.js # demo/src/less/lib/fontface.less # dist/plyr.css # dist/plyr.js # gulpfile.js # package-lock.json # package.json # readme.md # src/js/plyr.js # src/less/plyr.less # src/scss/plyr.scss
| * | | Slider stylingSam Potts2018-01-075-13/+17
| | | |
| * | | Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2018-01-0514-10/+82
| |\ \ \
| | * | | Started on error handlingSam2018-01-0416-12/+84
| | | | |
| * | | | TweaksSam Potts2018-01-054-3/+9501
| |/ / /
| * | | Fix for promise issue on Chrome, loading fixSam2017-12-277-11/+21
| | | |
| * | | Docs, restored loadSprite and supported static methodsSam Potts2017-12-2310-35/+144
| | | |
| * | | Vimeo fixSam Potts2017-12-218-9/+16
| | | |
| * | | Badge tweakSam Potts2017-12-213-3/+7
| | | |
| * | | Fix for scrubberSam Potts2017-12-203-3/+3
| | | |
| * | | Small fixesSam Potts2017-12-2011-13/+13
| | | |
| * | | DocsSam Potts2017-12-201-2/+2
| | | |
| * | | Fix SASS bundleSam Potts2017-12-207-9/+13
| | | |
| * | | Comment updateSam Potts2017-12-201-1/+1
| | | |
| * | | Remove chaning ability and return promise for play()Sam Potts2017-12-208-48/+34
| | | |
| * | | Split up settings fileSam Potts2017-12-2015-107/+134
| | | |
| * | | Fix for roundingSam Potts2017-12-203-84/+8
| | | |
| * | | Converted to SASS/SCSSSam Potts2017-12-2079-9966/+6998
| | | |
| * | | Minor tweaksSam Potts2017-12-1810-43/+35
| | | |