|
|
986c802acd
|
Merge branch 'beta-with-ads' of github.com:sampotts/plyr into beta-with-ads
# Conflicts:
# src/js/plugins/ads.js
|
2018-01-19 14:30:11 +11:00 |
|
|
|
021f6c8460
|
Comments and formatting
|
2018-01-19 14:26:25 +11:00 |
|
|
|
ed6048034b
|
Noticed that Plyr stopped working when ads are blocked.
|
2018-01-18 14:04:47 +01:00 |
|
|
|
8af312fe3c
|
Updated pause and resume content methods within Ads class.
|
2018-01-18 12:31:10 +01:00 |
|
|
|
d87ada4f58
|
Reformatted ads codebase and added/ changed comments. Also removed un-used events.
|
2018-01-18 12:26:53 +01:00 |
|
|
|
31c8166562
|
Fixed string literal and position issue of the midroll cue inside the time line. Added a check for the progress element existence.
|
2018-01-17 15:57:10 +01:00 |
|
|
|
0cb2f95888
|
Removed an un-used variable.
|
2018-01-17 15:43:08 +01:00 |
|
|
|
896ea7c689
|
Added cue markings within the time line for when midrolls will be displayed. Removed unusued callback parameter.
|
2018-01-17 15:38:26 +01:00 |
|
|
|
1d1eb02bd7
|
Added the logging of our main promises to their resolving callback. Otherwise they come up as null.
|
2018-01-17 14:44:44 +01:00 |
|
|
|
3583165b30
|
Removed logic related to starting the ad by clicking/ tapping the advertisement container. Ad is started by plyr play method.
|
2018-01-17 14:09:11 +01:00 |
|
|
|
d822f0c6bf
|
Adsmanager is now re/pre-loaded with new ads when the video is done or an ad error appears. Will make it possible to request ads when a new video is loaded. Added comments and missing events within the adsmanagerloader method.
|
2018-01-17 13:58:39 +01:00 |
|
|
|
9e52296dc6
|
Moved the ads container to be outside of the video wrapper. This way we can easily move the ad in front or behind the video controls based on content resume or pause IMA events.
|
2018-01-17 12:19:32 +01:00 |
|
|
|
12a7a4142c
|
Moved the logic for pausing and playing the video to content pause/ resume IMA events to avoid flickering. Also used events for resolving the adsmanager and adsloader promises.
|
2018-01-17 11:32:13 +01:00 |
|
|
|
8348f79742
|
Fix loading/playing of the ads when there is no valid ads.tagUrl
|
2018-01-17 08:31:36 +01:00 |
|
|
|
ec73d34bd3
|
Some tweaks
|
2018-01-16 23:06:40 +01:00 |
|
|
|
1cef48d4f8
|
fix blocking play() if ads are set
|
2018-01-15 23:30:54 +01:00 |
|
|
|
4b0005c28e
|
Added promises, missing events, new ad tag and additional logging.
|
2018-01-15 14:47:34 +01:00 |
|
|
|
8064405dbc
|
Tweaks
|
2018-01-14 23:33:18 +11:00 |
|
|
|
22e8892993
|
Code tweaks
|
2018-01-14 23:15:33 +11:00 |
|
|
|
bbdf225d7b
|
Fix loading google ima sdk
|
2018-01-14 08:21:35 +01:00 |
|
|
|
025fc1090b
|
Implementing ads plugin
|
2018-01-13 23:02:59 +01:00 |
|
