EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

main
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>
<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>
<ng-container *ngIf="mode === 'external'">

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

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

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 { CoreUrl } from '@singletons/url';
import { CoreSites } from '@services/sites';
import { CoreUtils } from '@singletons/utils';
interface MimeTypeInfo {
type: string;
@ -193,8 +194,10 @@ export class CoreMimetypeUtilsProvider {
return `<img src="${path}">`;
case 'audio':
case 'video':
// Add videoJS class and ID because the media could use the VideoJS player.
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}">`,
`</${embedType}>`,
].join('');