Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Linting, housekeeping, duration fix (fixes #1074) | Sam Potts | 2018-06-29 | 1 | -7/+7 |
| | |||||
* | Ads only on HTML5 and .is cleanup | Sam Potts | 2018-06-21 | 1 | -1/+3 |
| | |||||
* | 120 line width, package upgrade | Sam Potts | 2018-06-17 | 1 | -1/+5 |
| | |||||
* | Merge branch 'develop' of github.com:sampotts/plyr into develop | Sam Potts | 2018-06-13 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | | | # 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 | ||||
* | | Utils broken down into seperate files and exports | Sam Potts | 2018-06-13 | 1 | -17/+21 |
|/ | |||||
* | v3.3.5 | Sam Potts | 2018-05-06 | 1 | -1/+1 |
| | |||||
* | Small bug fixes | Sam Potts | 2018-05-06 | 1 | -1/+4 |
| | |||||
* | v3.3.0 | Sam Potts | 2018-05-06 | 1 | -3/+6 |
| | |||||
* | Muted and autoplay fixes, small bug fixes | Sam Potts | 2018-03-30 | 1 | -15/+23 |
| | |||||
* | Fixes for fast forward and issues with event.preventDefault() | Sam Potts | 2018-03-27 | 1 | -1/+2 |
| | |||||
* | 3.0.0-beta.20 | Sam Potts | 2018-03-13 | 1 | -2/+2 |
| | |||||
* | Update ads | Sam Potts | 2018-03-13 | 1 | -18/+7 |
| | |||||
* | Fix for null manager race condition | Sam Potts | 2018-03-11 | 1 | -39/+41 |
| | |||||
* | Normalised event names and removed unused | Sam Potts | 2018-03-11 | 1 | -18/+20 |
| | |||||
* | Add optional argument to Ads.trigger (currently only used for adblocker error) | Albin Larsson | 2018-03-10 | 1 | -4/+5 |
| | |||||
* | Event listener fixes, loadScript promise, ads tweaks | Sam Potts | 2018-03-11 | 1 | -48/+61 |
| | |||||
* | Removed redundant wrappers within the adsmanager promises. | Arthur Hulsman | 2018-03-09 | 1 | -3/+3 |
| | |||||
* | Ad block detection would not work when calling play() right after creating ↵ | Arthur Hulsman | 2018-03-09 | 1 | -36/+31 |
| | | | | the player instance, so the adsManager now also rejects on such a case. Also made sure that calling play() will wait for the adsManager promise to resolve or otherwise return the media.play() method. | ||||
* | Resizing the ad container while having it on display none will return offset ↵ | Arthur Hulsman | 2018-03-07 | 1 | -5/+4 |
| | | | | width and height of 0, which will cause ads not to play when ad sizes are set within the clients DSP. Also making sure that the inner containers of the ad container are full size. The container is now hidden/ displayed using z-index. | ||||
* | Made sure that cue points for midrolls are not displayed when the ad rule ↵ | Arthur Hulsman | 2018-03-07 | 1 | -1/+1 |
| | | | | for a midroll doesn't exceed the total play time of a video. | ||||
* | Removed a double this.enabled variable and updated a comment in ads.js. Also ↵ | Arthur Hulsman | 2018-03-06 | 1 | -8/+5 |
| | | | | made sure the adsmanager promise also can fail, so we can use it to wait for getting the advertisement ready when someone clicks the play button. Otherwise there it can look glitchy when the actual video starts playing and the video ad plays a few seconds later because the vast tag was slow to retrieve. Also fixed a typo. | ||||
* | Typo | Sam Potts | 2018-03-03 | 1 | -1/+1 |
| | |||||
* | Ready event fix, YouTube play event fix, docs update | Sam Potts | 2018-03-03 | 1 | -1/+1 |
| | |||||
* | Merge branch 'beta' into fix/ads-blocked | Sam Potts | 2018-01-30 | 1 | -10/+31 |
|\ | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # dist/plyr.js.map # src/js/plugins/ads.js # src/js/plyr.js | ||||
| * | Attempt to fix YouTube message error, added ads references, changes to bool | Sam Potts | 2018-01-25 | 1 | -2/+18 |
| | | |||||
| * | Restored “Ad” in label | Sam Potts | 2018-01-24 | 1 | -1/+2 |
| | | |||||
* | | Fix typo's | ferdiemmen | 2018-01-29 | 1 | -2/+2 |
| | | |||||
* | | fix(ads): Fixes media from playing when ads are blocked | ferdiemmen | 2018-01-29 | 1 | -1/+7 |
|/ | |||||
* | Renamed property, UI tweak | Sam Potts | 2018-01-23 | 1 | -8/+12 |
| | |||||
* | Fix bug where ad would play on every play action | ferdiemmen | 2018-01-22 | 1 | -3/+0 |
| | |||||
* | Small tweaks | Sam Potts | 2018-01-22 | 1 | -3/+6 |
| | |||||
* | Formatting, events and ad countdown added | Sam Potts | 2018-01-22 | 1 | -80/+140 |
| | |||||
* | Formatting and “ad” badge | Sam Potts | 2018-01-19 | 1 | -92/+77 |
| | |||||
* | 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 |
| |