From ff71dd07a6db2b9fb60e1b756eac84ef103cabe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Wed, 20 Sep 2017 17:19:35 +0200 Subject: [PATCH] Unify appearance of avatars for undefined and unknown users MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When calling the jQuery avatar plugin with a user that did not exist (that is, users for which "/avatar/{user}/{size}" return a JSON response with an empty "displayname" value) "?" on a grey background was shown. However, if the jQuery avatar plugin was called with an undefined JavaScript value then "?" was shown on a bluish background. This commit unifies both cases to use the grey background. The unit tests were also modified to ensure that the grey background is used in both cases. Signed-off-by: Daniel Calviño Sánchez --- core/js/jquery.avatar.js | 1 + core/js/tests/specs/jquery.avatarSpec.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index 29d019baea7..5813a80646f 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -73,6 +73,7 @@ user = this.data('user'); } else { this.imageplaceholder('?'); + this.css('background-color', '#b9b9b9'); return; } } diff --git a/core/js/tests/specs/jquery.avatarSpec.js b/core/js/tests/specs/jquery.avatarSpec.js index dab78500d0b..87767c8bc8f 100644 --- a/core/js/tests/specs/jquery.avatarSpec.js +++ b/core/js/tests/specs/jquery.avatarSpec.js @@ -62,10 +62,12 @@ describe('jquery.avatar tests', function() { it('undefined user', function() { spyOn($div, 'imageplaceholder'); + spyOn($div, 'css'); $div.avatar(); expect($div.imageplaceholder).toHaveBeenCalledWith('?'); + expect($div.css).toHaveBeenCalledWith('background-color', '#b9b9b9'); }); describe('no avatar', function() { @@ -86,6 +88,7 @@ describe('jquery.avatar tests', function() { it('show placeholder for non existing user', function() { spyOn($div, 'imageplaceholder'); + spyOn($div, 'css'); $div.avatar('foo'); fakeServer.requests[0].respond( @@ -97,6 +100,7 @@ describe('jquery.avatar tests', function() { ); expect($div.imageplaceholder).toHaveBeenCalledWith('foo', '?'); + expect($div.css).toHaveBeenCalledWith('background-color', '#b9b9b9'); }); it('show no placeholder', function() {