hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-ngonchanges-not-working-for-themed-components_contribute-7.2' into fix-ngonchanges-not-working-for-themed-components_contribute-7.4

Browse Source 
# Conflicts:
#	src/app/app.component.ts
This commit is contained in:
Alexandre Vryghem
2023-08-06 19:59:08 +02:00
parent ea677bda74 e4b386b815
commit a7bef6ffe2
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/shared/theme-support/theme.service.ts
View File

@@ -240,14 +240,7 @@ export class ThemeService {
if (hasValue(parentThemeName)) {
// inherit the head tags of the parent theme
return this.createHeadTags(parentThemeName);
}
const defaultThemeConfig = getDefaultThemeConfig();
const defaultThemeName = defaultThemeConfig.name;
if (
hasNoValue(defaultThemeName) ||
themeName === defaultThemeName ||
themeName === BASE_THEME_NAME
) {
} else {
// last resort, use fallback favicon.ico
return [
this.createHeadTag({
@@ -260,9 +253,6 @@ export class ThemeService {
})
];
}
// inherit the head tags of the default theme
return this.createHeadTags(defaultThemeName);
}
return headTagConfigs.map(this.createHeadTag.bind(this));