39 Commits

Author SHA1 Message Date
Sam Potts
e206edc1f6 Event listener fixes, loadScript promise, ads tweaks 2018-03-11 02:03:35 +11:00
Arthur Hulsman
6a2ca534d2 Removed redundant wrappers within the adsmanager promises. 2018-03-09 14:29:37 +01:00
Arthur Hulsman
69ffcbad27 Ad block detection would not work when calling play() right after creating 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. 2018-03-09 11:17:24 +01:00
Arthur Hulsman
819f7d1080 Resizing the ad container while having it on display none will return offset 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. 2018-03-07 15:43:48 +01:00
Arthur Hulsman
409b588458 Made sure that cue points for midrolls are not displayed when the ad rule for a midroll doesn't exceed the total play time of a video. 2018-03-07 15:17:30 +01:00
Arthur Hulsman
e90a603d57 Removed a double this.enabled variable and updated a comment in ads.js. Also 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. 2018-03-06 17:27:59 +01:00
Sam Potts
0300610108 Typo 2018-03-03 23:14:57 +11:00
Sam Potts
317b08c703 Ready event fix, YouTube play event fix, docs update 2018-03-03 23:06:12 +11:00
Sam Potts
71efbe7a92 Merge branch 'beta' into fix/ads-blocked
# Conflicts:
#	dist/plyr.js
#	dist/plyr.js.map
#	src/js/plugins/ads.js
#	src/js/plyr.js
2018-01-30 09:22:14 +11:00
ferdiemmen
afd695cb39 Fix typo's 2018-01-29 22:45:46 +01:00
ferdiemmen
c4eb4c97ac fix(ads): Fixes media from playing when ads are blocked 2018-01-29 22:40:08 +01:00
Sam Potts
5e68f8c8dd Attempt to fix YouTube message error, added ads references, changes to bool 2018-01-25 22:41:30 +11:00
Sam Potts
b4e22e2e7b Restored “Ad” in label 2018-01-24 09:06:20 +11:00
Sam Potts
cc128e6088 Renamed property, UI tweak 2018-01-23 10:31:21 +11:00
ferdiemmen
3c8acb4e9e Fix bug where ad would play on every play action 2018-01-22 21:07:08 +01:00
Sam Potts
ebf53d14b1 Small tweaks 2018-01-22 23:39:09 +11:00
Sam Potts
5671235fd9 Formatting, events and ad countdown added 2018-01-22 23:15:10 +11:00
Sam Potts
5fad152cbf Formatting and “ad” badge 2018-01-19 20:24:15 +11:00
Sam Potts
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
Sam Potts
021f6c8460 Comments and formatting 2018-01-19 14:26:25 +11:00
Arthur Hulsman
ed6048034b Noticed that Plyr stopped working when ads are blocked. 2018-01-18 14:04:47 +01:00
Arthur Hulsman
8af312fe3c Updated pause and resume content methods within Ads class. 2018-01-18 12:31:10 +01:00
Arthur Hulsman
d87ada4f58 Reformatted ads codebase and added/ changed comments. Also removed un-used events. 2018-01-18 12:26:53 +01:00
Arthur Hulsman
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
Arthur Hulsman
0cb2f95888 Removed an un-used variable. 2018-01-17 15:43:08 +01:00
Arthur Hulsman
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
Arthur Hulsman
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
Arthur Hulsman
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
Arthur Hulsman
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
Arthur Hulsman
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
Arthur Hulsman
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
ferdiemmen
8348f79742 Fix loading/playing of the ads when there is no valid ads.tagUrl 2018-01-17 08:31:36 +01:00
ferdiemmen
ec73d34bd3 Some tweaks 2018-01-16 23:06:40 +01:00
ferdiemmen
1cef48d4f8 fix blocking play() if ads are set 2018-01-15 23:30:54 +01:00
Arthur Hulsman
4b0005c28e Added promises, missing events, new ad tag and additional logging. 2018-01-15 14:47:34 +01:00
Sam Potts
8064405dbc Tweaks 2018-01-14 23:33:18 +11:00
Sam Potts
22e8892993 Code tweaks 2018-01-14 23:15:33 +11:00
ferdiemmen
bbdf225d7b Fix loading google ima sdk 2018-01-14 08:21:35 +01:00
ferdiemmen
025fc1090b Implementing ads plugin 2018-01-13 23:02:59 +01:00