c734bc4957Merge branch 'beta' of github.com:sampotts/plyr into beta
Sam Potts
2018-03-10 23:32:55 +11:00
572b8a7acaManually merged PRs
Sam Potts
2018-03-10 23:32:48 +11:00
eebae4a227Merge pull request #802 from gehaktmolen/ad-hotfixes
Sam Potts
2018-03-10 23:32:15 +11:00
e0562752eaMerge pull request #795 from frogg/patch-1
v2
Sam Potts
2018-03-10 23:29:22 +11:00
6a2ca534d2Removed redundant wrappers within the adsmanager promises.
Arthur Hulsman
2018-03-09 14:29:37 +01:00
7adc2bc6c8Unneeded else has been removed within the play() method.
Arthur Hulsman
2018-03-09 13:21:19 +01:00
ba8d7831a7Made sure play() returns a promise.
Arthur Hulsman
2018-03-09 12:50:57 +01:00
69ffcbad27Ad 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.
Arthur Hulsman
2018-03-09 11:17:24 +01:00
819f7d1080Resizing 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.
Arthur Hulsman
2018-03-07 15:43:48 +01:00
409b588458Made 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.
Arthur Hulsman
2018-03-07 15:17:30 +01:00
e90a603d57Removed 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.
Arthur Hulsman
2018-03-06 17:27:59 +01:00
cc128e6088Renamed property, UI tweak
Sam Potts
2018-01-23 10:31:21 +11:00
3c8acb4e9eFix bug where ad would play on every play action
ferdiemmen
2018-01-22 21:07:08 +01:00
ebf53d14b1Small tweaks
Sam Potts
2018-01-22 23:39:09 +11:00
b298587c0bBug fix
Sam Potts
2018-01-22 23:20:03 +11:00
26e9aaceb8Version bump
Sam Potts
2018-01-22 23:17:40 +11:00
384f3d6edaGulp
Sam Potts
2018-01-22 23:16:50 +11:00
3aa5747c90Merge pull request #760 from sampotts/beta-with-ads
Sam Potts
2018-01-22 23:15:52 +11:00
5671235fd9Formatting, events and ad countdown added
Sam Potts
2018-01-22 23:15:10 +11:00
1dd5c9efd9Converted demo to iife
Sam Potts
2018-01-20 15:23:36 +11:00
5fad152cbfFormatting and “ad” badge
Sam Potts
2018-01-19 20:24:15 +11:00
f33ca846f2Build
Sam Potts
2018-01-19 14:30:28 +11:00
986c802acdMerge branch 'beta-with-ads' of github.com:sampotts/plyr into beta-with-ads
Sam Potts
2018-01-19 14:30:11 +11:00
98dd818bf6Merge branch 'beta' into beta-with-ads
Sam Potts
2018-01-19 14:28:39 +11:00
021f6c8460Comments and formatting
Sam Potts
2018-01-19 14:26:25 +11:00
392f837398Merge pull request #763 from gehaktmolen/beta-with-ads-adjustments
Sam Potts
2018-01-19 14:26:08 +11:00
6831c30534Transition event fix
Sam Potts
2018-01-19 14:22:26 +11:00
ed6048034bNoticed that Plyr stopped working when ads are blocked.
Arthur Hulsman
2018-01-18 14:04:47 +01:00
8af312fe3cUpdated pause and resume content methods within Ads class.
Arthur Hulsman
2018-01-18 12:31:10 +01:00
d87ada4f58Reformatted ads codebase and added/ changed comments. Also removed un-used events.
Arthur Hulsman
2018-01-18 12:26:53 +01:00
31c8166562Fixed string literal and position issue of the midroll cue inside the time line. Added a check for the progress element existence.
Arthur Hulsman
2018-01-17 15:57:10 +01:00
0cb2f95888Removed an un-used variable.
Arthur Hulsman
2018-01-17 15:43:08 +01:00
896ea7c689Added cue markings within the time line for when midrolls will be displayed. Removed unusued callback parameter.
Arthur Hulsman
2018-01-17 15:38:26 +01:00
1d1eb02bd7Added the logging of our main promises to their resolving callback. Otherwise they come up as null.
Arthur Hulsman
2018-01-17 14:44:44 +01:00
3583165b30Removed logic related to starting the ad by clicking/ tapping the advertisement container. Ad is started by plyr play method.
Arthur Hulsman
2018-01-17 14:09:11 +01:00
d822f0c6bfAdsmanager 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.
Arthur Hulsman
2018-01-17 13:58:39 +01:00
9e52296dc6Moved 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.
Arthur Hulsman
2018-01-17 12:19:32 +01:00
12a7a4142cMoved 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.
Arthur Hulsman
2018-01-17 11:32:13 +01:00
8348f79742Fix loading/playing of the ads when there is no valid ads.tagUrl
ferdiemmen
2018-01-17 08:31:36 +01:00
Albin Larsson
Sam Potts
Arthur Hulsman
Frederik Riedel
Sam Potts
Sam Potts
ferdiemmen
Gabriel Dunn
Ferdi