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

Merge pull request #4082 from crazyserver/MOBILE-4470 

MOBILE-4470 icon: Add a forced exception for BBB on version 4.0
main
Dani Palou 2024-06-04 14:32:15 +02:00 committed by GitHub
parent 70289d1878 b4e7f35372
commit 7fd9fbeb09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/components/mod-icon/mod-icon.ts
View File

@ -134,21 +134,25 @@ export class CoreModIconComponent implements OnInit, OnChanges {
// Reset the branded class to the original value. // Reset the branded class to the original value.
this.brandedClass = this.isBranded; this.brandedClass = this.isBranded;
// No icon or local icon (not legacy), colorize it.
if (!this.iconUrl() || this.isLocalUrl()) {
// Exception for bigbluebuttonbn, it's the only one that has a branded icon. // Exception for bigbluebuttonbn, it's the only one that has a branded icon.
if (this.iconVersion === IconVersion.VERSION_4_0 && this.modname === 'bigbluebuttonbn') { if (this.iconVersion === IconVersion.VERSION_4_0 && this.modname === 'bigbluebuttonbn') {
// Known issue, if the icon is overriden by theme it won't be colorized.
this.brandedClass = true; this.brandedClass = true;
return; return;
} }
// No icon or local icon (not legacy), colorize it.
if (!this.iconUrl() || this.isLocalUrl()) {
this.brandedClass ??= false; this.brandedClass ??= false;
return; return;
} }
this.iconUrl.update(value => CoreTextUtils.decodeHTMLEntities(value)); this.iconUrl.update(value => CoreTextUtils.decodeHTMLEntities(value));
if (this.brandedClass !== undefined) {
return;
}
// If it's an Moodle Theme icon, check if filtericon is set and use it. // If it's an Moodle Theme icon, check if filtericon is set and use it.
if (CoreUrlUtils.isThemeImageUrl(this.iconUrl())) { if (CoreUrlUtils.isThemeImageUrl(this.iconUrl())) {