aboutsummaryrefslogtreecommitdiffstats
path: root/src/js/plugins
diff options
context:
space:
mode:
authorSam Potts <sam@potts.es>2020-12-20 20:11:41 +1100
committerSam Potts <sam@potts.es>2020-12-20 20:12:21 +1100
commitba09bc32d3bcd8002abe1ae4f629fc11ff55a7fc (patch)
treeb71aba80d7ddfe9477cf68dd406dac9de84c7557 /src/js/plugins
parentd7195d5276becbf21bbad8781d91b955aef39eb1 (diff)
downloadplyr-ba09bc32d3bcd8002abe1ae4f629fc11ff55a7fc.tar.lz
plyr-ba09bc32d3bcd8002abe1ae4f629fc11ff55a7fc.tar.xz
plyr-ba09bc32d3bcd8002abe1ae4f629fc11ff55a7fc.zip
fix: use bound arrow functions in classes
Diffstat (limited to 'src/js/plugins')
-rw-r--r--src/js/plugins/ads.js76
-rw-r--r--src/js/plugins/preview-thumbnails.js92
2 files changed, 84 insertions, 84 deletions
diff --git a/src/js/plugins/ads.js b/src/js/plugins/ads.js
index 12b5cc31..5d9406d1 100644
--- a/src/js/plugins/ads.js
+++ b/src/js/plugins/ads.js
@@ -77,7 +77,7 @@ class Ads {
/**
* Load the IMA SDK
*/
- load() {
+ load = () => {
if (!this.enabled) {
return;
}
@@ -95,12 +95,12 @@ class Ads {
} else {
this.ready();
}
- }
+ };
/**
* Get the ads instance ready
*/
- ready() {
+ ready = () => {
// Double check we're enabled
if (!this.enabled) {
destroy(this);
@@ -120,7 +120,7 @@ class Ads {
// Setup the IMA SDK
this.setupIMA();
- }
+ };
// Build the tag URL
get tagUrl() {
@@ -153,7 +153,7 @@ class Ads {
* properly place mid-rolls. After we create the ad display container, we initialize it. On
* mobile devices, this initialization is done as the result of a user action.
*/
- setupIMA() {
+ setupIMA = () => {
// Create the container for our advertisements
this.elements.container = createElement('div', {
class: this.player.config.classNames.ads,
@@ -186,12 +186,12 @@ class Ads {
// Request video ads to be pre-loaded
this.requestAds();
- }
+ };
/**
* Request advertisements
*/
- requestAds() {
+ requestAds = () => {
const { container } = this.player.elements;
try {
@@ -216,13 +216,13 @@ class Ads {
} catch (e) {
this.onAdError(e);
}
- }
+ };
/**
* Update the ad countdown
* @param {Boolean} start
*/
- pollCountdown(start = false) {
+ pollCountdown = (start = false) => {
if (!start) {
clearInterval(this.countdownTimer);
this.elements.container.removeAttribute('data-badge-text');
@@ -236,13 +236,13 @@ class Ads {
};
this.countdownTimer = setInterval(update, 100);
- }
+ };
/**
* This method is called whenever the ads are ready inside the AdDisplayContainer
* @param {Event} adsManagerLoadedEvent
*/
- onAdsManagerLoaded(event) {
+ onAdsManagerLoaded = (event) => {
// Load could occur after a source change (race condition)
if (!this.enabled) {
return;
@@ -273,9 +273,9 @@ class Ads {
// Resolve our adsManager
this.trigger('loaded');
- }
+ };
- addCuePoints() {
+ addCuePoints = () => {
// Add advertisement cue's within the time line if available
if (!is.empty(this.cuePoints)) {
this.cuePoints.forEach((cuePoint) => {
@@ -294,7 +294,7 @@ class Ads {
}
});
}
- }
+ };
/**
* This is where all the event handling takes place. Retrieve the ad from the event. Some
@@ -302,7 +302,7 @@ class Ads {
* https://developers.google.com/interactive-media-ads/docs/sdks/html5/v3/apis#ima.AdEvent.Type
* @param {Event} event
*/
- onAdEvent(event) {
+ onAdEvent = (event) => {
const { container } = this.player.elements;
// Retrieve the ad from the event. Some events (e.g. ALL_ADS_COMPLETED)
// don't have ad object associated
@@ -410,23 +410,23 @@ class Ads {
default:
break;
}
- }
+ };
/**
* Any ad error handling comes through here
* @param {Event} event
*/
- onAdError(event) {
+ onAdError = (event) => {
this.cancel();
this.player.debug.warn('Ads error', event);
- }
+ };
/**
* Setup hooks for Plyr and window events. This ensures
* the mid- and post-roll launch at the correct time. And
* resize the advertisement when the player resizes
*/
- listeners() {
+ listeners = () => {
const { container } = this.player.elements;
let time;
@@ -464,12 +464,12 @@ class Ads {
this.manager.resize(container.offsetWidth, container.offsetHeight, google.ima.ViewMode.NORMAL);
}
});
- }
+ };
/**
* Initialize the adsManager and start playing advertisements
*/
- play() {
+ play = () => {
const { container } = this.player.elements;
if (!this.managerPromise) {
@@ -503,12 +503,12 @@ class Ads {
}
})
.catch(() => {});
- }
+ };
/**
* Resume our video
*/
- resumeContent() {
+ resumeContent = () => {
// Hide the advertisement container
this.elements.container.style.zIndex = '';
@@ -517,12 +517,12 @@ class Ads {
// Play video
silencePromise(this.player.media.play());
- }
+ };
/**
* Pause our video
*/
- pauseContent() {
+ pauseContent = () => {
// Show the advertisement container
this.elements.container.style.zIndex = 3;
@@ -531,7 +531,7 @@ class Ads {
// Pause our video.
this.player.media.pause();
- }
+ };
/**
* Destroy the adsManager so we can grab new ads after this. If we don't then we're not
@@ -539,7 +539,7 @@ class Ads {
* video requests. https://developers.google.com/interactive-
* media-ads/docs/sdks/android/faq#8
*/
- cancel() {
+ cancel = () => {
// Pause our video
if (this.initialized) {
this.resumeContent();
@@ -550,12 +550,12 @@ class Ads {
// Re-create our adsManager
this.loadAds();
- }
+ };
/**
* Re-create our adsManager
*/
- loadAds() {
+ loadAds = () => {
// Tell our adsManager to go bye bye
this.managerPromise
.then(() => {
@@ -576,13 +576,13 @@ class Ads {
this.requestAds();
})
.catch(() => {});
- }
+ };
/**
* Handles callbacks after an ad event was invoked
* @param {String} event - Event type
*/
- trigger(event, ...args) {
+ trigger = (event, ...args) => {
const handlers = this.events[event];
if (is.array(handlers)) {
@@ -592,7 +592,7 @@ class Ads {
}
});
}
- }
+ };
/**
* Add event listeners
@@ -600,7 +600,7 @@ class Ads {
* @param {Function} callback - Callback for when event occurs
* @return {Ads}
*/
- on(event, callback) {
+ on = (event, callback) => {
if (!is.array(this.events[event])) {
this.events[event] = [];
}
@@ -608,7 +608,7 @@ class Ads {
this.events[event].push(callback);
return this;
- }
+ };
/**
* Setup a safety timer for when the ad network doesn't respond for whatever reason.
@@ -618,27 +618,27 @@ class Ads {
* @param {Number} time
* @param {String} from
*/
- startSafetyTimer(time, from) {
+ startSafetyTimer = (time, from) => {
this.player.debug.log(`Safety timer invoked from: ${from}`);
this.safetyTimer = setTimeout(() => {
this.cancel();
this.clearSafetyTimer('startSafetyTimer()');
}, time);
- }
+ };
/**
* Clear our safety timer(s)
* @param {String} from
*/
- clearSafetyTimer(from) {
+ clearSafetyTimer = (from) => {
if (!is.nullOrUndefined(this.safetyTimer)) {
this.player.debug.log(`Safety timer cleared from: ${from}`);
clearTimeout(this.safetyTimer);
this.safetyTimer = null;
}
- }
+ };
}
export default Ads;
diff --git a/src/js/plugins/preview-thumbnails.js b/src/js/plugins/preview-thumbnails.js
index 16167247..80e8cd4a 100644
--- a/src/js/plugins/preview-thumbnails.js
+++ b/src/js/plugins/preview-thumbnails.js
@@ -103,7 +103,7 @@ class PreviewThumbnails {
return this.player.isHTML5 && this.player.isVideo && this.player.config.previewThumbnails.enabled;
}
- load() {
+ load = () => {
// Toggle the regular seek tooltip
if (this.player.elements.display.seekTooltip) {
this.player.elements.display.seekTooltip.hidden = this.enabled;
@@ -126,10 +126,10 @@ class PreviewThumbnails {
this.loaded = true;
});
- }
+ };
// Download VTT files and parse them
- getThumbnails() {
+ getThumbnails = () => {
return new Promise((resolve) => {
const { src } = this.player.config.previewThumbnails;
@@ -164,10 +164,10 @@ class PreviewThumbnails {
Promise.all(promises).then(sortAndResolve);
}
});
- }
+ };
// Process individual VTT file
- getThumbnail(url) {
+ getThumbnail = (url) => {
return new Promise((resolve) => {
fetch(url).then((response) => {
const thumbnail = {
@@ -202,9 +202,9 @@ class PreviewThumbnails {
tempImage.src = thumbnail.urlPrefix + thumbnail.frames[0].text;
});
});
- }
+ };
- startMove(event) {
+ startMove = (event) => {
if (!this.loaded) {
return;
}
@@ -245,13 +245,13 @@ class PreviewThumbnails {
// Download and show image
this.showImageAtCurrentTime();
- }
+ };
- endMove() {
+ endMove = () => {
this.toggleThumbContainer(false, true);
- }
+ };
- startScrubbing(event) {
+ startScrubbing = (event) => {
// Only act on left mouse button (0), or touch device (event.button does not exist or is false)
if (is.nullOrUndefined(event.button) || event.button === false || event.button === 0) {
this.mouseDown = true;
@@ -265,9 +265,9 @@ class PreviewThumbnails {
this.showImageAtCurrentTime();
}
}
- }
+ };
- endScrubbing() {
+ endScrubbing = () => {
this.mouseDown = false;
// Hide scrubbing preview. But wait until the video has successfully seeked before hiding the scrubbing preview
@@ -283,12 +283,12 @@ class PreviewThumbnails {
}
});
}
- }
+ };
/**
* Setup hooks for Plyr and window events
*/
- listeners() {
+ listeners = () => {
// Hide thumbnail preview - on mouse click, mouse leave (in listeners.js for now), and video play/seek. All four are required, e.g., for buffering
this.player.on('play', () => {
this.toggleThumbContainer(false, true);
@@ -301,12 +301,12 @@ class PreviewThumbnails {
this.player.on('timeupdate', () => {
this.lastTime = this.player.media.currentTime;
});
- }
+ };
/**
* Create HTML elements for image containers
*/
- render() {
+ render = () => {
// Create HTML element: plyr__preview-thumbnail-container
this.elements.thumb.container = createElement('div', {
class: this.player.config.classNames.previewThumbnails.thumbContainer,
@@ -339,18 +339,18 @@ class PreviewThumbnails {
});
this.player.elements.wrapper.appendChild(this.elements.scrubbing.container);
- }
+ };
- destroy() {
+ destroy = () => {
if (this.elements.thumb.container) {
this.elements.thumb.container.remove();
}
if (this.elements.scrubbing.container) {
this.elements.scrubbing.container.remove();
}
- }
+ };
- showImageAtCurrentTime() {
+ showImageAtCurrentTime = () => {
if (this.mouseDown) {
this.setScrubbingContainerSize();
} else {
@@ -387,10 +387,10 @@ class PreviewThumbnails {
this.showingThumb = thumbNum;
this.loadImage(qualityIndex);
}
- }
+ };
// Show the image that's currently specified in this.showingThumb
- loadImage(qualityIndex = 0) {
+ loadImage = (qualityIndex = 0) => {
const thumbNum = this.showingThumb;
const thumbnail = this.thumbnails[qualityIndex];
const { urlPrefix } = thumbnail;
@@ -426,9 +426,9 @@ class PreviewThumbnails {
this.currentImageElement.dataset.index = thumbNum;
this.removeOldImages(this.currentImageElement);
}
- }
+ };
- showImage(previewImage, frame, qualityIndex, thumbNum, thumbFilename, newImage = true) {
+ showImage = (previewImage, frame, qualityIndex, thumbNum, thumbFilename, newImage = true) => {
this.player.debug.log(
`Showing thumb: ${thumbFilename}. num: ${thumbNum}. qual: ${qualityIndex}. newimg: ${newImage}`,
);
@@ -449,10 +449,10 @@ class PreviewThumbnails {
this.preloadNearby(thumbNum, true)
.then(this.preloadNearby(thumbNum, false))
.then(this.getHigherQuality(qualityIndex, previewImage, frame, thumbFilename));
- }
+ };
// Remove all preview images that aren't the designated current image
- removeOldImages(currentImage) {
+ removeOldImages = (currentImage) => {
// Get a list of all images, convert it from a DOM list to an array
Array.from(this.currentImageContainer.children).forEach((image) => {
if (image.tagName.toLowerCase() !== 'img') {
@@ -476,11 +476,11 @@ class PreviewThumbnails {
}, removeDelay);
}
});
- }
+ };
// Preload images before and after the current one. Only if the user is still hovering/seeking the same frame
// This will only preload the lowest quality
- preloadNearby(thumbNum, forward = true) {
+ preloadNearby = (thumbNum, forward = true) => {
return new Promise((resolve) => {
setTimeout(() => {
const oldThumbFilename = this.thumbnails[0].frames[thumbNum].text;
@@ -527,10 +527,10 @@ class PreviewThumbnails {
}
}, 300);
});
- }
+ };
// If user has been hovering current image for half a second, look for a higher quality one
- getHigherQuality(currentQualityIndex, previewImage, frame, thumbFilename) {
+ getHigherQuality = (currentQualityIndex, previewImage, frame, thumbFilename) => {
if (currentQualityIndex < this.thumbnails.length - 1) {
// Only use the higher quality version if it's going to look any better - if the current thumb is of a lower pixel density than the thumbnail container
let previewImageHeight = previewImage.naturalHeight;
@@ -550,7 +550,7 @@ class PreviewThumbnails {
}, 300);
}
}
- }
+ };
get currentImageContainer() {
if (this.mouseDown) {
@@ -605,7 +605,7 @@ class PreviewThumbnails {
}
}
- toggleThumbContainer(toggle = false, clearShowing = false) {
+ toggleThumbContainer = (toggle = false, clearShowing = false) => {
const className = this.player.config.classNames.previewThumbnails.thumbContainerShown;
this.elements.thumb.container.classList.toggle(className, toggle);
@@ -613,9 +613,9 @@ class PreviewThumbnails {
this.showingThumb = null;
this.showingThumbFilename = null;
}
- }
+ };
- toggleScrubbingContainer(toggle = false) {
+ toggleScrubbingContainer = (toggle = false) => {
const className = this.player.config.classNames.previewThumbnails.scrubbingContainerShown;
this.elements.scrubbing.container.classList.toggle(className, toggle);
@@ -623,17 +623,17 @@ class PreviewThumbnails {
this.showingThumb = null;
this.showingThumbFilename = null;
}
- }
+ };
- determineContainerAutoSizing() {
+ determineContainerAutoSizing = () => {
if (this.elements.thumb.imageContainer.clientHeight > 20 || this.elements.thumb.imageContainer.clientWidth > 20) {
// This will prevent auto sizing in this.setThumbContainerSizeAndPos()
this.sizeSpecifiedInCSS = true;
}
- }
+ };
// Set the size to be about a quarter of the size of video. Unless option dynamicSize === false, in which case it needs to be set in CSS
- setThumbContainerSizeAndPos() {
+ setThumbContainerSizeAndPos = () => {
if (!this.sizeSpecifiedInCSS) {
const thumbWidth = Math.floor(this.thumbContainerHeight * this.thumbAspectRatio);
this.elements.thumb.imageContainer.style.height = `${this.thumbContainerHeight}px`;
@@ -653,9 +653,9 @@ class PreviewThumbnails {
}
this.setThumbContainerPos();
- }
+ };
- setThumbContainerPos() {
+ setThumbContainerPos = () => {
const seekbarRect = this.player.elements.progress.getBoundingClientRect();
const plyrRect = this.player.elements.container.getBoundingClientRect();
const { container } = this.elements.thumb;
@@ -674,20 +674,20 @@ class PreviewThumbnails {
}
container.style.left = `${previewPos}px`;
- }
+ };
// Can't use 100% width, in case the video is a different aspect ratio to the video container
- setScrubbingContainerSize() {
+ setScrubbingContainerSize = () => {
const { width, height } = fitRatio(this.thumbAspectRatio, {
width: this.player.media.clientWidth,
height: this.player.media.clientHeight,
});
this.elements.scrubbing.container.style.width = `${width}px`;
this.elements.scrubbing.container.style.height = `${height}px`;
- }
+ };
// Sprites need to be offset to the correct location
- setImageSizeAndOffset(previewImage, frame) {
+ setImageSizeAndOffset = (previewImage, frame) => {
if (!this.usingSprites) {
return;
}
@@ -703,7 +703,7 @@ class PreviewThumbnails {
previewImage.style.left = `-${frame.x * multiplier}px`;
// eslint-disable-next-line no-param-reassign
previewImage.style.top = `-${frame.y * multiplier}px`;
- }
+ };
}
export default PreviewThumbnails;