diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2016-11-23 19:27:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 19:27:59 +0100 |
| commit | 56c926bc8b5b7e08dd0db32e70af132506735ca3 (patch) | |
| tree | 2cc3bbb6d50f9c6a7db80be33fde8e188135359a /core | |
| parent | d342eedc777413cc4b9438d53faed561563e03bf (diff) | |
| parent | 34849f7bd3c93cf15546438e997c63bb6b5a84a6 (diff) | |
| download | nextcloud-server-56c926bc8b5b7e08dd0db32e70af132506735ca3.tar.gz nextcloud-server-56c926bc8b5b7e08dd0db32e70af132506735ca3.zip | |
Merge pull request #2247 from nextcloud/avatar-fallback
use ? instead of X for avatar name fallback
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/jquery.avatar.js | 6 | ||||
| -rw-r--r-- | core/js/tests/specs/jquery.avatarSpec.js | 4 |
2 files changed, 5 insertions, 5 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 { 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() { |