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

MOBILE-3833 collapsible: Do not init collapsible heading if not needed

main
Pau Ferrer Ocaña 2022-03-31 13:09:59 +02:00
parent 46dd468314
commit bc2e38dece
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addons/mod/folder/pages/index/index.html
View File

@ -1,4 +1,4 @@
<ion-header collapsible> <ion-header [collapsible]="!subfolder">
<ion-toolbar> <ion-toolbar>
<ion-buttons slot="start"> <ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button> <ion-back-button [text]="'core.back' | translate"></ion-back-button>

2
src/addons/mod/wiki/pages/index/index.html
View File

@ -1,4 +1,4 @@
<ion-header collapsible> <ion-header [collapsible]="!this.pageId && !this.pageTitle">
<ion-toolbar> <ion-toolbar>
<ion-buttons slot="start"> <ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button> <ion-back-button [text]="'core.back' | translate"></ion-back-button>

20
src/core/directives/collapsible-header.ts
View File

@ -88,7 +88,18 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
/** /**
* @inheritdoc * @inheritdoc
*/ */
async ngOnInit(): Promise<void> { ngOnInit(): void {
this.init();
}
/**
* Init function.
*/
async init(): Promise<void> {
if (!this.collapsible || this.expandedHeader) {
return;
}
this.initializePage(); this.initializePage();
await Promise.all([ await Promise.all([
@ -104,9 +115,12 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
/** /**
* @inheritdoc * @inheritdoc
*/ */
ngOnChanges(changes: {[name: string]: SimpleChange}): void { async ngOnChanges(changes: {[name: string]: SimpleChange}): Promise<void> {
if (changes.collapsible) { if (changes.collapsible) {
this.enabled = !CoreUtils.isFalseOrZero(changes.collapsible.currentValue); this.enabled = !CoreUtils.isFalseOrZero(changes.collapsible.currentValue);
await this.init();
setTimeout(() => { setTimeout(() => {
this.setEnabled(this.enabled); this.setEnabled(this.enabled);
}, 200); }, 200);
@ -160,8 +174,10 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest
// Timeout in case event is never fired. // Timeout in case event is never fired.
const timeout = window.setTimeout(() => { const timeout = window.setTimeout(() => {
if (this.firstEnter) {
this.firstEnter = false; this.firstEnter = false;
this.enteredPromise.reject(new Error('[collapsible-header] Waiting for ionViewDidEnter timeout reached')); this.enteredPromise.reject(new Error('[collapsible-header] Waiting for ionViewDidEnter timeout reached'));
}
}, 5000); }, 5000);
this.resizeListener = CoreDom.onWindowResize(() => { this.resizeListener = CoreDom.onWindowResize(() => {