Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/lib/components/modal/modal.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,12 @@ export class ModalComponent extends NgxParentComponentDirective implements OnIni
* @returns {Promise<void>} - A promise that resolves when the event is handled.
*/
override async handleEvent(event: IBaseCustomEvent): Promise<void> {
// if (event instanceof Event || event.name === ComponentEventNames.Refresh) {
// if (event instanceof Event) {
// event.stopImmediatePropagation();
// }
// return;
// }
if (event instanceof Event) {
event.stopImmediatePropagation();
}
Expand Down
7 changes: 5 additions & 2 deletions src/lib/engine/NgxPageDirective.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,11 @@ export abstract class NgxPageDirective extends NgxComponentDirective implements
if (!menu) menu = this.menu;
const activeMenu = menu.find((item) => item?.url?.includes(route));
if (activeMenu) {
const label = `${(activeMenu?.title || activeMenu?.label || '').toLowerCase()}`;
const title = `${await this.translate(label ? 'menu.' + label : label)} ${this.appName ? `- ${this.appName}` : ''}`;
let label = `${(activeMenu?.title || activeMenu?.label || '').toLowerCase()}`;
if (!label.startsWith('menu.')) {
label = `menu.${label}`;
}
const title = `${await this.translate(label)} ${this.appName ? `- ${this.appName}` : ''}`;
this.titleService.setTitle(title);
if (!this.title) this.title = title;
}
Expand Down
Loading