aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'beta' into fix/ads-blockedSam Potts2018-01-304-17/+42
|\ | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # dist/plyr.js.map # src/js/plugins/ads.js # src/js/plyr.js
| * Version bumpSam Potts2018-01-251-1/+1
| |
| * Attempt to fix YouTube message error, added ads references, changes to boolSam Potts2018-01-254-7/+27
| |
| * Restored “Ad” in labelSam Potts2018-01-243-2/+4
| |
| * Version bumpSam Potts2018-01-231-1/+1
| |
* | Fix typo'sferdiemmen2018-01-291-2/+2
| |
* | fix(ads): Fixes media from playing when ads are blockedferdiemmen2018-01-293-4/+25
|/
* Renamed property, UI tweakSam Potts2018-01-233-14/+17
|
* Fix bug where ad would play on every play actionferdiemmen2018-01-222-15/+2
|
* Small tweaksSam Potts2018-01-223-9/+13
|
* Bug fixSam Potts2018-01-223-2/+7
|
* Version bumpSam Potts2018-01-221-1/+1
|
* Formatting, events and ad countdown addedSam Potts2018-01-225-107/+193
|
* Formatting and “ad” badgeSam Potts2018-01-194-103/+98
|
* Merge branch 'beta-with-ads' of github.com:sampotts/plyr into beta-with-adsSam Potts2018-01-193-267/+271
|\ | | | | | | | | # Conflicts: # src/js/plugins/ads.js
| * Noticed that Plyr stopped working when ads are blocked.Arthur Hulsman2018-01-181-3/+6
| |
| * Updated pause and resume content methods within Ads class.Arthur Hulsman2018-01-181-5/+5
| |
| * Reformatted ads codebase and added/ changed comments. Also removed un-used ↵Arthur Hulsman2018-01-181-164/+119
| | | | | | | | events.
| * Fixed string literal and position issue of the midroll cue inside the time ↵Arthur Hulsman2018-01-171-5/+8
| | | | | | | | line. Added a check for the progress element existence.
| * Removed an un-used variable.Arthur Hulsman2018-01-171-3/+1
| |
| * Added cue markings within the time line for when midrolls will be displayed. ↵Arthur Hulsman2018-01-173-2/+30
| | | | | | | | Removed unusued callback parameter.
| * Added the logging of our main promises to their resolving callback. ↵Arthur Hulsman2018-01-171-0/+4
| | | | | | | | Otherwise they come up as null.
| * Removed logic related to starting the ad by clicking/ tapping the ↵Arthur Hulsman2018-01-172-61/+2
| | | | | | | | 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 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-193-6/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # demo/dist/demo.js # demo/dist/demo.js.map # dist/plyr.js # dist/plyr.js.map
| * | Transition event fixSam Potts2018-01-193-6/+6
| | |
* | | Comments and formattingSam Potts2018-01-191-14/+39
| |/ |/|
* | Fix loading/playing of the ads when there is no valid ads.tagUrlferdiemmen2018-01-172-30/+18
| |
* | Some tweaksferdiemmen2018-01-162-72/+97
| |
* | fix blocking play() if ads are setferdiemmen2018-01-152-49/+49
| |
* | Added promises, missing events, new ad tag and additional logging.Arthur Hulsman2018-01-151-68/+213
| |
* | TweaksSam Potts2018-01-141-5/+5
| |
* | Code tweaksSam Potts2018-01-146-48/+63
| |
* | Merge branch 'beta' into beta-with-adsSam Potts2018-01-141-2/+5
|\| | | | | | | | | | | | | | | # Conflicts: # demo/dist/demo.js # demo/dist/demo.js.map # dist/plyr.js # dist/plyr.js.map
| * Minor logic tweakSam Potts2018-01-141-2/+5
| |
* | Fix loading google ima sdkferdiemmen2018-01-141-3/+9
| |
* | Implementing ads pluginferdiemmen2018-01-135-0/+356
|/
* Progressively enhance <iframe> embedsSam Potts2018-01-128-74/+168
|
* Beta version up on https://plyr.io/beta and CDNSam Potts2018-01-091-1/+1
|
* Publishing to /betaSam Potts2018-01-091-2/+2
|
* Styling tweaksSam Potts2018-01-091-1/+0
|
* Use CSS custom property for webkit range fillSam Potts2018-01-082-30/+9
|
* Package tweaksSam Potts2018-01-082-3/+1
|
* Empty storage fixSam Potts2018-01-071-1/+6
|
* Slider stylingSam Potts2018-01-073-11/+15
|
* Started on error handlingSam2018-01-049-5/+77
|
* Fix for promise issue on Chrome, loading fixSam2017-12-272-6/+15
|
* Docs, restored loadSprite and supported static methodsSam Potts2017-12-232-8/+28
|
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-13 09:51:50 +0000