MOBILE-3320 siteplugins: Fix issue when opening new plugin page
parent
684de1214c
commit
a6a2d24a57
|
@ -117,7 +117,7 @@ export class CoreCompileHtmlComponent implements OnChanges, OnDestroy, DoCheck {
|
||||||
// eslint-disable-next-line @angular-eslint/no-conflicting-lifecycle
|
// eslint-disable-next-line @angular-eslint/no-conflicting-lifecycle
|
||||||
async ngOnChanges(changes: Record<string, SimpleChange>): Promise<void> {
|
async ngOnChanges(changes: Record<string, SimpleChange>): Promise<void> {
|
||||||
// Only compile if text/javascript has changed or the forceCompile flag has been set to true.
|
// Only compile if text/javascript has changed or the forceCompile flag has been set to true.
|
||||||
if (this.text && (changes.text || changes.javascript ||
|
if (this.text !== undefined && (changes.text || changes.javascript ||
|
||||||
(changes.forceCompile && CoreUtils.isTrueOrOne(this.forceCompile)))) {
|
(changes.forceCompile && CoreUtils.isTrueOrOne(this.forceCompile)))) {
|
||||||
|
|
||||||
// Create a new component and a new module.
|
// Create a new component and a new module.
|
||||||
|
|
|
@ -681,14 +681,14 @@ export class CoreCourseHelperProvider {
|
||||||
throw new CoreError(Translate.instant('core.filenotfound'));
|
throw new CoreError(Translate.instant('core.filenotfound'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!CoreFileHelper.isOpenableInApp(module.contents[0])) {
|
const mainFile = files[0];
|
||||||
|
|
||||||
|
if (!CoreFileHelper.isOpenableInApp(mainFile)) {
|
||||||
await CoreFileHelper.showConfirmOpenUnsupportedFile();
|
await CoreFileHelper.showConfirmOpenUnsupportedFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
const site = await CoreSites.getSite(siteId);
|
const site = await CoreSites.getSite(siteId);
|
||||||
|
|
||||||
const mainFile = files[0];
|
|
||||||
|
|
||||||
// Check if the file should be opened in browser.
|
// Check if the file should be opened in browser.
|
||||||
if (CoreFileHelper.shouldOpenInBrowser(mainFile)) {
|
if (CoreFileHelper.shouldOpenInBrowser(mainFile)) {
|
||||||
return this.openModuleFileInBrowser(mainFile.fileurl, site, module, courseId, component, componentId, files);
|
return this.openModuleFileInBrowser(mainFile.fileurl, site, module, courseId, component, componentId, files);
|
||||||
|
|
|
@ -46,7 +46,7 @@ export class CoreSitePluginsMainMenuHomeHandler extends CoreSitePluginsBaseHandl
|
||||||
return {
|
return {
|
||||||
title: this.title,
|
title: this.title,
|
||||||
class: this.handlerSchema.displaydata?.class,
|
class: this.handlerSchema.displaydata?.class,
|
||||||
page: `siteplugins/${this.plugin.component}/${this.handlerSchema.method}/0`,
|
page: `siteplugins/homecontent/${this.plugin.component}/${this.handlerSchema.method}`,
|
||||||
pageParams: {
|
pageParams: {
|
||||||
title: this.title,
|
title: this.title,
|
||||||
initResult: this.initResult,
|
initResult: this.initResult,
|
||||||
|
|
|
@ -28,6 +28,13 @@ const routes: Routes = [
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const homeRoutes: Routes = [
|
||||||
|
{
|
||||||
|
path: 'siteplugins/homecontent/:component/:method',
|
||||||
|
loadChildren: () => import('./pages/plugin-page/plugin-page.module').then( m => m.CoreSitePluginsPluginPageModule),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
const courseIndexRoutes: Routes = [
|
const courseIndexRoutes: Routes = [
|
||||||
{
|
{
|
||||||
path: 'siteplugins/:handlerUniqueName',
|
path: 'siteplugins/:handlerUniqueName',
|
||||||
|
@ -47,7 +54,7 @@ const moduleRoutes: Routes = [
|
||||||
imports: [
|
imports: [
|
||||||
CoreMainMenuTabRoutingModule.forChild(moduleRoutes.concat(routes)),
|
CoreMainMenuTabRoutingModule.forChild(moduleRoutes.concat(routes)),
|
||||||
CoreCourseIndexRoutingModule.forChild({ children: courseIndexRoutes }),
|
CoreCourseIndexRoutingModule.forChild({ children: courseIndexRoutes }),
|
||||||
CoreMainMenuHomeRoutingModule.forChild({ children: routes }),
|
CoreMainMenuHomeRoutingModule.forChild({ children: homeRoutes }),
|
||||||
CoreSitePluginsComponentsModule,
|
CoreSitePluginsComponentsModule,
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
|
|
Loading…
Reference in New Issue