mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-17 14:51:19 +02:00
Code Issues Releases Wiki Activity

use display name for avatar color gen

Browse Source
This commit is contained in:
ctml91
2021-05-17 00:11:10 -04:00
committed by Daniël Klabbers
parent 7906660a9b
commit efb9aab106
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/core/js/src/common/models/User.js
View File

@@ -35,11 +35,11 @@ Object.assign(User.prototype, {
canDelete: Model.attribute('canDelete'), canDelete: Model.attribute('canDelete'),
avatarColor: null, avatarColor: null,
color: computed('username', 'avatarUrl', 'avatarColor', function (username, avatarUrl, avatarColor) { color: computed('displayName', 'avatarUrl', 'avatarColor', function (displayName, avatarUrl, avatarColor) {
// If we've already calculated and cached the dominant color of the user's // If we've already calculated and cached the dominant color of the user's
// avatar, then we can return that in RGB format. If we haven't, we'll want // avatar, then we can return that in RGB format. If we haven't, we'll want
// to calculate it. Unless the user doesn't have an avatar, in which case // to calculate it. Unless the user doesn't have an avatar, in which case
// we generate a color from their username. // we generate a color from their display name.
if (avatarColor) { if (avatarColor) {
return 'rgb(' + avatarColor.join(', ') + ')'; return 'rgb(' + avatarColor.join(', ') + ')';
} else if (avatarUrl) { } else if (avatarUrl) {
@@ -47,7 +47,7 @@ Object.assign(User.prototype, {
return ''; return '';
} }
return '#' + stringToColor(username); return '#' + stringToColor(displayName);
}), }),
/** /**