CIT/Vmeda.Online
3
0
Fork 1
forked from EVOgeek/Vmeda.Online
Code Pull Requests Activity

MOBILE-4705 mod_resource: Use VideoJS if needed in embedded media

Browse Source
This commit is contained in:
Dani Palou 2025-01-15 10:22:53 +01:00
parent 070fbc5cd1
commit a95e65ead0
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addons/mod/resource/components/index/addon-mod-resource-index.html
View File

@ -35,7 +35,7 @@
</ng-container> </ng-container>
<div *ngIf="mode === 'embedded'" class="ion-padding"> <div *ngIf="mode === 'embedded'" class="ion-padding">
<core-format-text [text]="contentText" [filter]="false" /> <core-format-text [text]="contentText" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId" />
</div> </div>
<ng-container *ngIf="mode === 'external'"> <ng-container *ngIf="mode === 'external'">

10
src/core/classes/element-controllers/MediaElementController.ts
View File

@ -114,9 +114,7 @@ export class MediaElementController extends ElementController {
return; return;
} }
const player = await this.searchJSPlayer(); // Start listening to events because the player could be created while we're searching for it, causing a race condition.
if (!player) {
this.jsPlayerListener = CoreEvents.on(VIDEO_JS_PLAYER_CREATED, ({ element, player }) => { this.jsPlayerListener = CoreEvents.on(VIDEO_JS_PLAYER_CREATED, ({ element, player }) => {
if (element !== media) { if (element !== media) {
return; return;
@ -126,11 +124,13 @@ export class MediaElementController extends ElementController {
this.jsPlayer.resolve(player); this.jsPlayer.resolve(player);
}); });
return; const player = await this.searchJSPlayer();
}
if (player && !this.jsPlayer.isSettled()) {
this.jsPlayerListener?.off();
this.jsPlayer.resolve(player); this.jsPlayer.resolve(player);
} }
}
/** /**
* Start listening playback events. * Start listening playback events.

5
src/core/services/utils/mimetype.ts
View File

@ -27,6 +27,7 @@ import mimeToExt from '@/assets/mimetoext.json';
import { CoreFileEntry, CoreFileHelper } from '@services/file-helper'; import { CoreFileEntry, CoreFileHelper } from '@services/file-helper';
import { CoreUrl } from '@singletons/url'; import { CoreUrl } from '@singletons/url';
import { CoreSites } from '@services/sites'; import { CoreSites } from '@services/sites';
import { CoreUtils } from '@singletons/utils';
interface MimeTypeInfo { interface MimeTypeInfo {
type: string; type: string;
@ -193,8 +194,10 @@ export class CoreMimetypeUtilsProvider {
return `<img src="${path}">`; return `<img src="${path}">`;
case 'audio': case 'audio':
case 'video': case 'video':
// Add videoJS class and ID because the media could use the VideoJS player.
return [ return [
`<${embedType} controls title="${filename}" src="${path}" controlsList="nodownload">`, `<${embedType} controls title="${filename}" src="${path}" controlsList="nodownload" class="video-js" ` +
`id="id_videojs_moodleapp_${CoreUtils.getUniqueId('CoreMimetypeUtils-embedded-media')}">`,
`<source src="${path}" type="${mimeType}">`, `<source src="${path}" type="${mimeType}">`,
`</${embedType}>`, `</${embedType}>`,
].join(''); ].join('');