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.
* 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 pull request #740 from gurinderhans/masterSam Potts2018-01-071-0/+8
| |\ | | | | | | double click player to toggle fullscreen
| | * add comment about no fullscreen if player type is audioGurinder Hans2017-12-231-0/+2
| | |
| | * add double click to make full screen supportGurinder Hans2017-12-231-0/+6
| | |
* | | 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
| * | Merge pull request #726 from xDae/masterSam Potts2018-01-051-0/+3
| |\ \ | | | | | | | | Added react port
| | * | Added react portJose Miguel Bejarano2017-12-041-0/+3
| | |/
| * | Merge pull request #743 from jwpage/patch-1Sam Potts2018-01-031-1/+1
| |\ \ | | |/ | |/| Fix `enabled` smartphone example in README
| | * Fix `enabled` smartphone example in READMEJohnson Page2018-01-031-1/+1
| |/
| * Fix for YouTube .getVideoData() issue (fixes #709)Sam Potts2017-11-146-10/+15
| |
| * Update readme.mdSam Potts2017-11-071-1/+1
| |
| * Merge pull request #696 from yuriykuzin/enable-speed-controls-on-vimeoSam Potts2017-11-061-0/+1
| |\ | | | | | | Enable speed controls using Vimeo API
| | * Merge branch 'master' into enable-speed-controls-on-vimeoSam Potts2017-11-0616-799/+5446
| | |\ | | |/ | |/|
| * | Vimeo fixes + small bug fixesSam Potts2017-11-0414-814/+5405
| | |
| * | Merge pull request #577 from brandon-pereira/masterSam Potts2017-11-043-5/+6
| |\ \ | | | | | | | | fix for svg4everybody conflicting with plyr
| | * \ Merge branch 'master' into masterSam Potts2017-11-040-0/+0
| | |\ \ | | |/ / | |/| |
| | * | Merge branch 'master' into masterSam Potts2017-11-0417-1164/+1448
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #613 from vers-one/masterSam Potts2017-11-042-2/+6
| |\ \ \ | | | | | | | | | | Fix for handling explicitly set duration of audio
| | * \ \ Merge branch 'master' into masterSam Potts2017-11-040-0/+0
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' into masterSam Potts2017-11-0415-1128/+1408
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #617 from oemueller/patch-1Sam Potts2017-11-041-4/+6
| |\ \ \ \ | | | | | | | | | | | | [bugfix] target is null exception
| | * | | | [bugfix] target is null exceptionOliver2017-07-121-4/+6
| | | | | | | | | | | | | | | | | | when using 'play-large' without a 'play' button, the statement target = target[0]; caused an error. So it is necessary to check the value of target before accessing [0]
| * | | | | Merge pull request #649 from waltercruz/masterSam Potts2017-11-046-5/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | Adding title to the player html template
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-01 19:26:28 +0000