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

Merge pull request #4063 from dpalou/MOBILE-4470 

Mobile 4470
main
Pau Ferrer Ocaña 2024-05-24 12:29:52 +02:00 committed by GitHub
parent 84a7ed034d bdadea8e4d
commit 888d518e86
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/directives/external-content.ts
View File

@ -423,6 +423,11 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges, O
return;
}
if (this.isPlayedMedia()) {
// Don't update the URL if it's a media that already started playing, otherwise the media will be reloaded.
return;
}
const newState = await CoreFilepool.getFileStateByUrl(site.getId(), url);
if (newState === state) {
return;
@ -461,6 +466,29 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges, O
}
}
/**
* Check if the source affects a media element that is already playing and not ended.
*
* @returns Whether it's a played media element.
*/
protected isPlayedMedia(): boolean {
let mediaElement: HTMLVideoElement | HTMLAudioElement | null = null;
if (this.element.tagName === 'VIDEO') {
mediaElement = this.element as HTMLVideoElement;
} else if (this.element.tagName === 'AUDIO') {
mediaElement = this.element as HTMLAudioElement;
} else if (this.element.tagName === 'SOURCE' || this.element.tagName === 'TRACK') {
mediaElement = this.element.closest<HTMLVideoElement | HTMLAudioElement>('video,audio');
}
if (!mediaElement) {
return false;
}
return !mediaElement.paused || (mediaElement.currentTime > 0.1 && !mediaElement.ended);
}
/**
* Wait for the image to be loaded or error, and emit an event when it happens.
*/

2
src/core/features/course/components/module-summary/module-summary.ts
View File

@ -123,7 +123,7 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
this.packageStatusObserver = CoreEvents.on(
CoreEvents.PACKAGE_STATUS_CHANGED,
(data) => {
if (data.componentId == module.id && data.component == this.component) {
if (data.componentId === this.module?.id && data.component == this.component) {
this.getPackageStatus();
}
},

2
src/core/features/course/services/course-helper.ts
View File

@ -1967,6 +1967,7 @@ export class CoreCourseHelperProvider {
completion.state = completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE
? CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE
: CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE;
completion.isoverallcomplete = completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE;
try {
const response = await CoreCourse.markCompletedManually(
@ -1985,6 +1986,7 @@ export class CoreCourseHelperProvider {
completion.state = completion.state === CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE
? CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE
: CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE;
completion.isoverallcomplete = !completion.isoverallcomplete;
CoreDomUtils.showErrorModalDefault(error, 'core.errorchangecompletion', true);
} finally {