changeset 5a29ca0aa777 in sao:6.0
details: https://hg.tryton.org/sao?cmd=changeset&node=5a29ca0aa777
description:
Do not add image for empty avatar URL
issue10868
review367701002
(grafted from f9b71289bf696b369fd5c99cd1313202d1deffc0)
diffstat:
src/sao.js | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diffs (47 lines):
diff -r 7b0e3f281e24 -r 5a29ca0aa777 src/sao.js
--- a/src/sao.js Thu Oct 21 00:22:12 2021 +0200
+++ b/src/sao.js Fri Oct 22 00:33:34 2021 +0200
@@ -681,30 +681,28 @@
};
Sao.user_menu = function(preferences) {
- var avatar_url = preferences.avatar_url || '';
- if (avatar_url) {
- avatar_url += '?s=30';
- }
- var avatar_badge_url = preferences.avatar_badge_url || '';
- if (avatar_badge_url){
- avatar_badge_url += '?s=15';
- }
jQuery('#user-preferences').empty();
jQuery('#user-favorites').empty();
- jQuery('#user-preferences').append(jQuery('<a/>', {
+ var user = jQuery('<a/>', {
'href': '#',
'title': preferences.status_bar,
}).click(function(evt) {
evt.preventDefault();
Sao.preferences();
- }).text(preferences.status_bar)
- .prepend(jQuery('<img/>', {
- 'src': avatar_badge_url,
+ }).text(preferences.status_bar);
+ jQuery('#user-preferences').append(user);
+ if (preferences.avatar_badge_url) {
+ user.prepend(jQuery('<img/>', {
+ 'src': preferences.avatar_badge_url + '?s=15',
'class': 'img-circle img-badge',
- })).prepend(jQuery('<img/>', {
- 'src': avatar_url,
+ }));
+ }
+ if (preferences.avatar_url) {
+ user.prepend(jQuery('<img/>', {
+ 'src': preferences.avatar_url + '?s=30',
'class': 'img-circle',
- })));
+ }));
+ }
var title = Sao.i18n.gettext("Logout");
jQuery('#user-logout > a')
.attr('title', title)