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

MOBILE-3664 course: Check site plugins when opening course

Browse Source
This commit is contained in:
Dani Palou 2021-03-05 08:17:42 +01:00
parent 76f67faada
commit 98bea1f502
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/features/course/services/course.ts
View File

@ -41,6 +41,7 @@ import { CoreCourseHelper, CoreCourseModuleCompletionData } from './course-helpe
import { CoreCourseFormatDelegate } from './format-delegate'; import { CoreCourseFormatDelegate } from './format-delegate';
import { CoreCronDelegate } from '@services/cron'; import { CoreCronDelegate } from '@services/cron';
import { CoreCourseLogCronHandler } from './handlers/log-cron'; import { CoreCourseLogCronHandler } from './handlers/log-cron';
import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
const ROOT_CACHE_KEY = 'mmCourse:'; const ROOT_CACHE_KEY = 'mmCourse:';
@ -1026,7 +1027,7 @@ export class CoreCourseProvider {
const loading = await CoreDomUtils.showModalLoading(); const loading = await CoreDomUtils.showModalLoading();
// Wait for site plugins to be fetched. // Wait for site plugins to be fetched.
// @todo await this.sitePluginsProvider.waitFetchPlugins(); await CoreSitePlugins.waitFetchPlugins();
if (!('format' in course) || typeof course.format == 'undefined') { if (!('format' in course) || typeof course.format == 'undefined') {
const result = await CoreCourseHelper.getCourse(course.id); const result = await CoreCourseHelper.getCourse(course.id);
@ -1034,7 +1035,9 @@ export class CoreCourseProvider {
course = result.course; course = result.course;
} }
if (course) { // @todo Replace with: if (!this.sitePluginsProvider.sitePluginPromiseExists('format_' + course.format)) { const format = 'format' in course && `format_${course.format}`;
if (!format || !CoreSitePlugins.sitePluginPromiseExists(`format_${format}`)) {
// No custom format plugin. We don't need to wait for anything. // No custom format plugin. We don't need to wait for anything.
await CoreCourseFormatDelegate.openCourse(<CoreCourseAnyCourseData> course, params); await CoreCourseFormatDelegate.openCourse(<CoreCourseAnyCourseData> course, params);
loading.dismiss(); loading.dismiss();
@ -1044,11 +1047,12 @@ export class CoreCourseProvider {
// This course uses a custom format plugin, wait for the format plugin to finish loading. // This course uses a custom format plugin, wait for the format plugin to finish loading.
try { try {
/* @todo await this.sitePluginsProvider.sitePluginLoaded('format_' + course.format); await CoreSitePlugins.sitePluginLoaded(format);
// The format loaded successfully, but the handlers wont be registered until all site plugins have loaded. // The format loaded successfully, but the handlers wont be registered until all site plugins have loaded.
if (this.sitePluginsProvider.sitePluginsFinishedLoading) { if (CoreSitePlugins.sitePluginsFinishedLoading) {
return CoreCourseFormatDelegate.openCourse(course, params); return CoreCourseFormatDelegate.openCourse(<CoreCourseAnyCourseData> course, params);
}*/ }
// Wait for plugins to be loaded. // Wait for plugins to be loaded.
const deferred = CoreUtils.promiseDefer<void>(); const deferred = CoreUtils.promiseDefer<void>();