wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2247 from nextcloud/avatar-fallback

Browse source 
use ? instead of X for avatar name fallback
This commit is contained in:
Roeland Jago Douma 2016-11-23 19:27:59 +01:00 committed by GitHub
commit 56c926bc8b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/js/jquery.avatar.js
View file

@ -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 {

4
core/js/tests/specs/jquery.avatarSpec.js
View file

@ -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() {