632 Commits

Author SHA1 Message Date
Sam Potts
1b13ddaa54 Update ads 2018-03-13 21:42:01 +11:00
Sam Potts
9981c349be Fix for null manager race condition 2018-03-11 18:23:47 +11:00
Sam Potts
b3365a7373 Normalised event names and removed unused 2018-03-11 12:54:51 +11:00
Albin Larsson
ef27ba16f4 Add optional argument to Ads.trigger (currently only used for adblocker error) 2018-03-10 16:20:33 +01:00
Sam Potts
e206edc1f6 Event listener fixes, loadScript promise, ads tweaks 2018-03-11 02:03:35 +11:00
Sam Potts
c734bc4957 Merge branch 'beta' of github.com:sampotts/plyr into beta 2018-03-10 23:32:55 +11:00
Sam Potts
572b8a7aca Manually merged PRs 2018-03-10 23:32:48 +11:00
Arthur Hulsman
6a2ca534d2 Removed redundant wrappers within the adsmanager promises. 2018-03-09 14:29:37 +01:00
Arthur Hulsman
7adc2bc6c8 Unneeded else has been removed within the play() method. 2018-03-09 13:21:19 +01:00
Arthur Hulsman
ba8d7831a7 Made sure play() returns a promise. 2018-03-09 12:50:57 +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
6f061621ad v3.0.0-beta.17 2018-03-03 23:16:15 +11:00
Sam Potts
0300610108 Typo 2018-03-03 23:14:57 +11:00
Sam Potts
2fba5f152c 3.0.0-beta.16 2018-03-03 23:06:54 +11:00
Sam Potts
317b08c703 Ready event fix, YouTube play event fix, docs update 2018-03-03 23:06:12 +11:00
Sam Potts
174234c166 v3.0.0-beta.15 2018-02-19 09:55:16 +11:00
Sam Potts
24b4220de5 Fix IE CORS captions 2018-02-19 09:52:46 +11:00
Sam Potts
f1895a4cce Pause button fix, polyfilled build, unminified builds 2018-02-17 19:34:15 +11:00
Sam Potts
c90f1bdf08 v3.0.0-beta.13 2018-02-13 00:02:13 +11:00
Sam Potts
6a9be8d16b Fix for custom controls 2018-02-13 00:01:19 +11:00
Sam Potts
58c2c52c95 Merge branch 'beta' of github.com:sampotts/plyr into beta 2018-02-11 15:09:40 +11:00
Sam Potts
73a39769d4 Fullscreen API changes, color settings tweaks 2018-02-11 15:09:34 +11:00
Sam Potts
7221e26eca
Merge pull request #780 from friday/captions-ie11-indexsizeerror
Fix harmless but annoying IE error 'IndexSizeError'
2018-02-06 12:51:45 +11:00
Albin Larsson
98adb8e784 Fix harmless but annoying IE error 'IndexSizeError' 2018-02-06 02:39:01 +01:00
Sam Potts
211db12a3d Readme merge 2018-02-06 11:06:46 +11:00
Sam Potts
f67315e20c 3.0.0-beta.12 2018-02-06 00:25:50 +11:00
Sam Potts
2150c44036 Added backwards compatibility for <div> embeds 2018-02-06 00:24:48 +11:00
Sam Potts
70c9fbdde3 Removed fetch dependency 2018-02-05 21:43:32 +11:00
Sam Potts
f3ea31c515 Merge branch 'beta' of github.com:sampotts/plyr into beta
# Conflicts:
#	dist/plyr.js
#	dist/plyr.js.map
2018-02-05 21:28:16 +11:00
Sam Potts
1ee88cba16 Testing fetch 2018-02-05 21:26:18 +11:00
Sam Potts
d76ef3ff91 Small UI tweaks and fix for instanceof issue 2018-01-31 19:33:00 +11:00
Sam Potts
2691c7c9d6 Version bump + icon fix 2018-01-30 13:01:05 +11:00
Sam Potts
6fae148fc1 Deploy 2018-01-30 09:26:09 +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
8f7a8940f3 Version bump 2018-01-25 22:42:52 +11: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
1f53b27d4e Version bump 2018-01-23 18:00:08 +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
b298587c0b Bug fix 2018-01-22 23:20:03 +11:00
Sam Potts
26e9aaceb8 Version bump 2018-01-22 23:17:40 +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