1065 Commits

Author SHA1 Message Date
Sam Potts
73a39769d4 Fullscreen API changes, color settings tweaks 2018-02-11 15:09:34 +11:00
Sam Potts
d21b58e1c9 Copy 2018-02-06 11:26:13 +11:00
Sam Potts
d6e84cbabb Nicer checks 2018-02-06 11:12:03 +11:00
Sam Potts
fcccf1d479 Copy 2018-02-06 11:08:26 +11:00
Sam Potts
211db12a3d Readme merge 2018-02-06 11:06:46 +11:00
Sam Potts
f67315e20c 3.0.0-beta.12 v3.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
af3ae75229
Update readme.md 2018-02-03 23:16:52 +11:00
Sam Potts
d76ef3ff91 Small UI tweaks and fix for instanceof issue v3.0.0-beta.11 2018-01-31 19:33:00 +11:00
Sam Potts
2691c7c9d6 Version bump + icon fix v3.0.0-beta.10 2018-01-30 13:01:05 +11:00
Sam Potts
26b1d8ce8f Fix UMD stuff 2018-01-30 12:57:19 +11:00
Sam Potts
6fae148fc1 Deploy v3.0.0-beta.9 2018-01-30 09:26:09 +11:00
Sam Potts
bb51647fe2
Merge pull request #772 from sampotts/fix/ads-blocked
Fix: ads blocked and media playing before ad plays
2018-01-30 09:22:54 +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 v3.0.0-beta.8 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 v3.0.0-beta.7 2018-01-24 09:06:20 +11:00
Sam Potts
d4234da9aa Docs tweak 2018-01-23 19:13:35 +11:00
Sam Potts
1f53b27d4e Version bump v3.0.0-beta.6 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
384f3d6eda Gulp 2018-01-22 23:16:50 +11:00
Sam Potts
3aa5747c90
Merge pull request #760 from sampotts/beta-with-ads
Beta with ads
2018-01-22 23:15:52 +11:00
Sam Potts
5671235fd9 Formatting, events and ad countdown added 2018-01-22 23:15:10 +11:00
Sam Potts
1dd5c9efd9 Converted demo to iife 2018-01-20 15:23:36 +11:00
Sam Potts
5fad152cbf Formatting and “ad” badge 2018-01-19 20:24:15 +11:00
Sam Potts
f33ca846f2 Build 2018-01-19 14:30:28 +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
98dd818bf6 Merge branch 'beta' into beta-with-ads
# Conflicts:
#	demo/dist/demo.js
#	demo/dist/demo.js.map
#	dist/plyr.js
#	dist/plyr.js.map
2018-01-19 14:28:39 +11:00
Sam Potts
021f6c8460 Comments and formatting 2018-01-19 14:26:25 +11:00
Sam Potts
392f837398
Merge pull request #763 from gehaktmolen/beta-with-ads-adjustments
Beta with ads - Reloading ads on new video
2018-01-19 14:26:08 +11:00
Sam Potts
6831c30534 Transition event fix 2018-01-19 14:22:26 +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