From 298cd0f1f8b38f5da3d9a17fd22479e329eaf7d0 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 22 Nov 2016 17:08:28 +0100 Subject: [PATCH 1/2] use ? instead of X for avatar name fallback Signed-off-by: Jan-Christoph Borchardt --- core/js/jquery.avatar.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index 754400acd7b..1abe70b79ea 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -29,7 +29,7 @@ * 3. $('.avatardiv').avatar(); * This will search the DOM for 'user' data, to use as the username. If there * is no username available it will default to a placeholder with the value of - * "x". The size will be determined the same way, as the second example. + * "?". The size will be determined the same way, as the second example. * * 4. $('.avatardiv').avatar('jdoe', 128, true); * This will behave like the first example, except it will also append random @@ -65,7 +65,7 @@ if (typeof(this.data('user')) !== 'undefined') { user = this.data('user'); } else { - this.imageplaceholder('x'); + this.imageplaceholder('?'); return; } } @@ -105,7 +105,7 @@ $div.imageplaceholder(user, result.data.displayname); } else { // User does not exist - $div.imageplaceholder(user, 'X'); + $div.imageplaceholder(user, '?'); $div.css('background-color', '#b9b9b9'); } } else { From 34849f7bd3c93cf15546438e997c63bb6b5a84a6 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 23 Nov 2016 18:02:23 +0100 Subject: [PATCH 2/2] fix unit tests Signed-off-by: Morris Jobke --- core/js/tests/specs/jquery.avatarSpec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/js/tests/specs/jquery.avatarSpec.js b/core/js/tests/specs/jquery.avatarSpec.js index f5caae10020..9bb10c41be7 100644 --- a/core/js/tests/specs/jquery.avatarSpec.js +++ b/core/js/tests/specs/jquery.avatarSpec.js @@ -65,7 +65,7 @@ describe('jquery.avatar tests', function() { $div.avatar(); - expect($div.imageplaceholder).toHaveBeenCalledWith('x'); + expect($div.imageplaceholder).toHaveBeenCalledWith('?'); }); describe('no avatar', function() { @@ -96,7 +96,7 @@ describe('jquery.avatar tests', function() { }) ); - expect($div.imageplaceholder).toHaveBeenCalledWith('foo', 'X'); + expect($div.imageplaceholder).toHaveBeenCalledWith('foo', '?'); }); it('show no placeholder', function() {