Commit Graph

161 Commits

Author SHA1 Message Date
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
Sam Potts d9ec1d1b8e Progressively enhance <iframe> embeds 2018-01-12 19:35:46 +11:00
Sam Potts 9e0c406a4a Remove chaning ability and return promise for play() 2017-12-20 20:47:02 +00:00
Sam Potts c8990bd379 IE & Edge fixes, Storage & Console classes 2017-12-08 10:05:38 +00:00
Sam Potts fd77831303 Fix display for current language on change 2017-11-25 01:19:16 +11:00
Sam Potts 921cefd212 Moved to provider + type to make it cleaner in future, fix for multiple players 2017-11-23 17:35:35 +11:00
Sam Potts de6f0f1b77 Updated data attributes to data-plyr namespace. Speed menu fixes 2017-11-23 12:57:43 +11:00
Sam Potts d3b31e595a Handle no audio, more docs in code, fix for playing getter 2017-11-21 20:14:57 +11:00
Sam Potts f518ec108b Vimeo autopause option 2017-11-21 13:33:51 +11:00
Sam Potts 2d4a166218 Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
#	dist/plyr.js
#	dist/plyr.js.map
2017-11-20 10:48:53 +11:00
Sam Potts feae00224e Added ended and playing getters 2017-11-20 10:48:28 +11:00
Sam Potts 0dc9681ae8 YouTube title 2017-11-19 23:35:07 +11:00
Sam Potts 4b62a5c74d Captions fix 2017-11-19 17:54:38 +11:00
Sam Potts 6984d6fb16 Controls cleanup, work on captions bug, click to invert time 2017-11-18 19:30:26 +11:00
Sam Potts d7a1c44281 Using fetch instead of xhr, grabbing title for YouTube 2017-11-16 11:38:06 +01:00
Sam Potts c64b8f6940 Started on error handling, Safari icon fix 2017-11-14 17:27:40 +01:00
Sam Potts 022b436c3f YouTube fix 2017-11-14 13:22:23 +01:00
Sam Potts 66917fd39b Use callback for loading Vimeo API 2017-11-09 19:44:07 +11:00
Sam Potts fd97607e55 Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
#	dist/plyr.js
#	dist/plyr.js.map
2017-11-09 19:41:12 +11:00
Sam Potts f878581c8f UI bugs 2017-11-09 19:40:45 +11:00
Sam Potts f9602acf61 Callback for loadScript 2017-11-09 16:06:49 +11:00
Sam Potts bb66be98da Volume fixes and other tidy up work 2017-11-08 23:46:20 +11:00
Sam Potts c948e95ade Looping, increase/decrease volume fix 2017-11-08 00:37:14 +11:00
Sam Potts 3f41a0cf54 Merge branch 'develop' of github.com:Selz/plyr into develop
# Conflicts:
#	readme.md
2017-11-07 23:21:35 +11:00
Sam Potts 84505da84b Automatic Vimeo aspect ratio 2017-11-06 22:00:00 +11:00
Sam Potts 3a9beaed59 Vimeo captions fix 2017-11-06 20:27:19 +11:00
Sam Potts 1578525ee3 Finished aspect ratio setting 2017-11-06 20:24:07 +11:00
Sam Potts 62c1b368cf Cleanup 2017-11-06 19:53:27 +11:00