Skip to content

Commit acbcd6b

Browse files
committed
fix: small improvements to internal-analytics
1 parent ed1fbef commit acbcd6b

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

src/plugins/cloudinary/index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,12 @@ class CloudinaryContext {
128128
const defaultPosterOptions = posterOptionsForCurrent();
129129
const userPosterOptions = options.posterOptions || {};
130130
options.poster = options.poster || defaultPosterOptions;
131-
options.posterOptions = Object.assign({}, defaultPosterOptions, userPosterOptions);
131+
options.posterOptions = Object.assign(
132+
{},
133+
defaultPosterOptions,
134+
userPosterOptions,
135+
{ hasUserPosterOptions: !!userPosterOptions || null }
136+
);
132137

133138
options.queryParams = Object.assign(options.queryParams || {}, options.allowUsageReport ? { _s: `vp-${VERSION}` } : {});
134139

src/utils/get-analytics-player-options.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const getSourceOptions = (sourceOptions = {}) => ({
1717
if (typeof sourceOptions.poster === 'string') return 'url';
1818
return undefined;
1919
})(),
20-
posterOptions: hasConfig(sourceOptions.posterOptions),
20+
posterOptions: sourceOptions.posterOptions?.hasUserPosterOptions,
2121
posterOptionsPublicId: sourceOptions.posterOptions && hasConfig(sourceOptions.posterOptions.publicId),
2222
autoShowRecommendations: sourceOptions.autoShowRecommendations,
2323
fontFace: sourceOptions.fontFace,
@@ -44,11 +44,11 @@ const getSourceOptions = (sourceOptions = {}) => ({
4444
} : {}),
4545
...(hasConfig(sourceOptions.textTracks) ? getTextTracksOptions(sourceOptions.textTracks) : {}),
4646
interactionAreas: hasConfig(sourceOptions.interactionAreas),
47-
videoSources: !!sourceOptions.videoSources,
47+
videoSources: !!sourceOptions.videoSources || null,
4848
});
4949

5050
const getTextTracksOptions = (textTracks = {}) => {
51-
const tracksArr = [textTracks.captions, ...(textTracks.subtitles || [])];
51+
const tracksArr = [textTracks.captions, ...(textTracks.subtitles || [])].filter(Boolean);
5252
return {
5353
textTracks: hasConfig(textTracks),
5454
textTracksLength: tracksArr.length,
@@ -97,7 +97,7 @@ export const getAnalyticsFromPlayerOptions = (playerOptions) => filterDefaultsAn
9797
bigPlayButton: playerOptions.bigPlayButton,
9898
className: playerOptions.class,
9999
cloudinaryAnalytics: !!playerOptions.cloudinaryAnalytics,
100-
cloudinaryAnalyticsOptions: isObject(playerOptions.cloudinaryAnalytics),
100+
cloudinaryAnalyticsOptions: isObject(playerOptions.cloudinaryAnalytics) || null,
101101
controls: playerOptions.controls,
102102
floatingWhenNotVisible: playerOptions.floatingWhenNotVisible,
103103
fluid: playerOptions.fluid,

0 commit comments

Comments
 (0)