| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch 'beta-with-ads' of github.com:sampotts/plyr into beta-with-ads | Sam Potts | 2018-01-19 | 1 | -266/+254 | |
| |\ | | | | | | | | | # Conflicts: # src/js/plugins/ads.js | |||||
| | * | Noticed that Plyr stopped working when ads are blocked. | Arthur Hulsman | 2018-01-18 | 1 | -3/+6 | |
| | | | ||||||
| | * | Updated pause and resume content methods within Ads class. | Arthur Hulsman | 2018-01-18 | 1 | -5/+5 | |
| | | | ||||||
| | * | Reformatted ads codebase and added/ changed comments. Also removed un-used ↵ | Arthur Hulsman | 2018-01-18 | 1 | -164/+119 | |
| | | | | | | | | | events. | |||||
| | * | Fixed string literal and position issue of the midroll cue inside the time ↵ | Arthur Hulsman | 2018-01-17 | 1 | -5/+8 | |
| | | | | | | | | | line. Added a check for the progress element existence. | |||||
| | * | Removed an un-used variable. | Arthur Hulsman | 2018-01-17 | 1 | -3/+1 | |
| | | | ||||||
| | * | Added cue markings within the time line for when midrolls will be displayed. ↵ | Arthur Hulsman | 2018-01-17 | 1 | -2/+15 | |
| | | | | | | | | | Removed unusued callback parameter. | |||||
| | * | Added the logging of our main promises to their resolving callback. ↵ | Arthur Hulsman | 2018-01-17 | 1 | -0/+4 | |
| | | | | | | | | | Otherwise they come up as null. | |||||
| | * | Removed logic related to starting the ad by clicking/ tapping the ↵ | Arthur Hulsman | 2018-01-17 | 1 | -60/+0 | |
| | | | | | | | | | advertisement container. Ad is started by plyr play method. | |||||
| | * | Adsmanager is now re/pre-loaded with new ads when the video is done or an ad ↵ | Arthur Hulsman | 2018-01-17 | 1 | -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 Hulsman | 2018-01-17 | 1 | -3/+15 | |
| | | | | | | | | | 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 Hulsman | 2018-01-17 | 1 | -37/+27 | |
| | | | | | | | | | IMA events to avoid flickering. Also used events for resolving the adsmanager and adsloader promises. | |||||
| * | | Comments and formatting | Sam Potts | 2018-01-19 | 1 | -14/+39 | |
| |/ | ||||||
| * | Fix loading/playing of the ads when there is no valid ads.tagUrl | ferdiemmen | 2018-01-17 | 1 | -22/+3 | |
| | | ||||||
| * | Some tweaks | ferdiemmen | 2018-01-16 | 1 | -69/+93 | |
| | | ||||||
| * | fix blocking play() if ads are set | ferdiemmen | 2018-01-15 | 1 | -49/+44 | |
| | | ||||||
| * | Added promises, missing events, new ad tag and additional logging. | Arthur Hulsman | 2018-01-15 | 1 | -68/+213 | |
| | | ||||||
| * | Tweaks | Sam Potts | 2018-01-14 | 1 | -5/+5 | |
| | | ||||||
| * | Code tweaks | Sam Potts | 2018-01-14 | 1 | -28/+35 | |
| | | ||||||
| * | Fix loading google ima sdk | ferdiemmen | 2018-01-14 | 1 | -3/+9 | |
| | | ||||||
| * | Implementing ads plugin | ferdiemmen | 2018-01-13 | 1 | -0/+329 | |
 |
index : plyr.git | |
| A fork of plyr without nonfree parts | heckyel |
| aboutsummaryrefslogtreecommitdiffstats |