Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into FEC-13507-handle-do…
Browse files Browse the repository at this point in the history
…c-entry

# Conflicts:
#	src/common/playlist/playlist-item.ts
#	src/kaltura-player.ts
  • Loading branch information
JonathanTGold committed Jan 23, 2024
1 parent 08c7498 commit b63c278
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ yarn-error.log
LICENSE
README.md
ts-typed/
webpack.config.js
tsconfig.json

11 changes: 8 additions & 3 deletions src/kaltura-player.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import { PlaylistManager } from './common/playlist/playlist-manager';
import { RemotePlayerManager } from './common/cast/remote-player-manager';
import {
hasImageSource,
hasDocumentSource,
hasYoutubeSource,
maybeSetStreamPriority,
mergeProviderPluginsConfig,
Expand Down Expand Up @@ -191,10 +192,10 @@ export class KalturaPlayer extends FakeEventTarget {
playerConfig.plugins[name] = playerConfig.plugins[name] || {};
});
this.configure({ session: mediaConfig.session });
if (!hasYoutubeSource(sources) && !hasImageSource(sources)) {
this._thumbnailManager = new ThumbnailManager(this, this.config.ui, mediaConfig);
} else {
if (hasYoutubeSource(sources) || hasImageSource(sources) || hasDocumentSource(sources)) {
this._thumbnailManager = null;
} else {
this._thumbnailManager = new ThumbnailManager(this, this.config.ui, mediaConfig);
}
this.updateKalturaPoster(sources, mediaConfig.sources, this._localPlayer.dimensions);
addKalturaParams(this, { ...playerConfig, sources });
Expand Down Expand Up @@ -387,6 +388,10 @@ export class KalturaPlayer extends FakeEventTarget {
return hasImageSource(this.sources);
}

public isDocument(): boolean {
return hasDocumentSource(this.sources);
}

public isAudio(): boolean {
return this._localPlayer.isAudio();
}
Expand Down

0 comments on commit b63c278

Please sign in to comment.