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

Merge pull request #2165 from dpalou/MOBILE-3211 

MOBILE-3211 siteplugins: Use current page title if not defined
main
Juan Leyva 2019-11-22 16:19:59 +01:00 committed by GitHub
parent 287aa73e08 481110e5d2
commit 659539c8a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/siteplugins/components/module-index/core-siteplugins-module-index.html
View File

@ -9,4 +9,4 @@
</core-context-menu>
</core-navbar-buttons>
<core-site-plugins-plugin-content *ngIf="component && method" [component]="component" [method]="method" [args]="args" [initResult]="initResult" [data]="jsData" (onContentLoaded)="contentLoaded($event)" (onLoadingContent)="contentLoading($event)"></core-site-plugins-plugin-content>
<core-site-plugins-plugin-content *ngIf="component && method" [component]="component" [method]="method" [args]="args" [initResult]="initResult" [data]="jsData" [pageTitle]="pageTitle" (onContentLoaded)="contentLoaded($event)" (onLoadingContent)="contentLoading($event)"></core-site-plugins-plugin-content>

1
src/core/siteplugins/components/module-index/module-index.ts
View File

@ -32,6 +32,7 @@ import { CoreSitePluginsPluginContentComponent } from '../plugin-content/plugin-
export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, CoreCourseModuleMainComponent {
@Input() module: any; // The module.
@Input() courseId: number; // Course ID the module belongs to.
@Input() pageTitle: string; // Current page title. It can be used by the "new-content" directives.
@ViewChild(CoreSitePluginsPluginContentComponent) content: CoreSitePluginsPluginContentComponent;

1
src/core/siteplugins/components/plugin-content/plugin-content.ts
View File

@ -37,6 +37,7 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck {
@Input() initResult: any; // Result of the init WS call of the handler.
@Input() data: any; // Data to pass to the component.
@Input() preSets: any; // The preSets for the WS call.
@Input() pageTitle: string; // Current page title. It can be used by the "new-content" directives.
@Output() onContentLoaded?: EventEmitter<boolean>; // Emits an event when the content is loaded.
@Output() onLoadingContent?: EventEmitter<boolean>; // Emits an event when starts to load the content.

2
src/core/siteplugins/directives/call-ws-new-content.ts
View File

@ -96,7 +96,7 @@ export class CoreSitePluginsCallWSNewContentDirective extends CoreSitePluginsCal
}
this.navCtrl.push('CoreSitePluginsPluginPage', {
title: this.title,
title: this.title || (this.parentContent && this.parentContent.pageTitle),
component: this.component || (this.parentContent && this.parentContent.component),
method: this.method || (this.parentContent && this.parentContent.method),
args: args,

2
src/core/siteplugins/directives/new-content.ts
View File

@ -93,7 +93,7 @@ export class CoreSitePluginsNewContentDirective implements OnInit {
}
this.navCtrl.push('CoreSitePluginsPluginPage', {
title: this.title,
title: this.title || (this.parentContent && this.parentContent.pageTitle),
component: this.component || (this.parentContent && this.parentContent.component),
method: this.method || (this.parentContent && this.parentContent.method),
args: args,

2
src/core/siteplugins/pages/module-index/module-index.html
View File

@ -11,5 +11,5 @@
<ion-refresher [enabled]="content && content.content && content.content.dataLoaded" (ionRefresh)="refreshData($event)">
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
</ion-refresher>
<core-site-plugins-module-index [module]="module" [courseId]="courseId"></core-site-plugins-module-index>
<core-site-plugins-module-index [module]="module" [courseId]="courseId" [pageTitle]="title"></core-site-plugins-module-index>
</ion-content>

2
src/core/siteplugins/pages/plugin-page/plugin-page.html
View File

@ -11,5 +11,5 @@
<ion-refresher [enabled]="content && content.dataLoaded" (ionRefresh)="refreshData($event)">
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
</ion-refresher>
<core-site-plugins-plugin-content [component]="component" [method]="method" [args]="args" [preSets]="preSets" [initResult]="initResult" [data]="jsData"></core-site-plugins-plugin-content>
<core-site-plugins-plugin-content [component]="component" [method]="method" [args]="args" [preSets]="preSets" [initResult]="initResult" [data]="jsData" [pageTitle]="title"></core-site-plugins-plugin-content>
</ion-content>