Commit Graph

1044 Commits

Author SHA1 Message Date
b4e22e2e7b Restored “Ad” in label v3.0.0-beta.7 2018-01-24 09:06:20 +11:00
d4234da9aa Docs tweak 2018-01-23 19:13:35 +11:00
1f53b27d4e Version bump v3.0.0-beta.6 2018-01-23 18:00:08 +11:00
cc128e6088 Renamed property, UI tweak 2018-01-23 10:31:21 +11:00
3c8acb4e9e Fix bug where ad would play on every play action 2018-01-22 21:07:08 +01:00
ebf53d14b1 Small tweaks 2018-01-22 23:39:09 +11:00
b298587c0b Bug fix 2018-01-22 23:20:03 +11:00
26e9aaceb8 Version bump 2018-01-22 23:17:40 +11:00
384f3d6eda Gulp 2018-01-22 23:16:50 +11:00
3aa5747c90 Merge pull request #760 from sampotts/beta-with-ads
Beta with ads
2018-01-22 23:15:52 +11:00
5671235fd9 Formatting, events and ad countdown added 2018-01-22 23:15:10 +11:00
1dd5c9efd9 Converted demo to iife 2018-01-20 15:23:36 +11:00
5fad152cbf Formatting and “ad” badge 2018-01-19 20:24:15 +11:00
f33ca846f2 Build 2018-01-19 14:30:28 +11:00
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
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
021f6c8460 Comments and formatting 2018-01-19 14:26:25 +11:00
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
6831c30534 Transition event fix 2018-01-19 14:22:26 +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
c24c05226d Merge pull request #761 from gehaktmolen/beta-with-ads-promises
Beta with ads - Added promises, missing events, new ad tag and additional logging.
2018-01-15 20:13:51 +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
cfc86bcb7c 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-14 22:55:44 +11:00
5f96ec6ac2 Minor logic tweak 2018-01-14 22:54:03 +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
d9ec1d1b8e Progressively enhance <iframe> embeds 2018-01-12 19:35:46 +11:00
2e5d06ad85 Publish script tweaks 2018-01-09 20:43:58 +11:00
bacd049eb0 Package 2018-01-09 20:26:56 +11:00
6fd7b26bb2 Beta version up on https://plyr.io/beta and CDN 2018-01-09 20:25:46 +11:00
1df79cf7f8 Publishing to /beta 2018-01-09 19:35:17 +11:00
e6badacf0d Recommended extensions for VS Code 2018-01-09 18:52:36 +11:00
a0d9d5eca8 Styling tweaks 2018-01-09 09:14:59 +11:00
8786377a75 Use CSS custom property for webkit range fill 2018-01-08 20:53:18 +11:00
f0322e8d94 Merge branch 'develop' of github.com:sampotts/plyr into develop 2018-01-08 19:42:29 +11:00