Browse Source

Show default placeholder if avatar image can't be fetched

* fixes owncloud/documents#601
* ref #14564
remotes/origin/comments-markallread-dav
Morris Jobke 11 years ago
parent
commit
b188de242e
  1. 7
      core/js/jquery.avatar.js

7
core/js/jquery.avatar.js

@ -81,8 +81,10 @@
// If the displayname is not defined we use the old code path // If the displayname is not defined we use the old code path
if (typeof(displayname) === 'undefined') { if (typeof(displayname) === 'undefined') {
$.get(url, function(result) {
if (typeof(result) === 'object') {
$.get(url).always(function(result, status) {
// if there is an error or an object returned (contains user information):
// -> show the fallback placeholder
if (typeof(result) === 'object' || status === 'error') {
if (!hidedefault) { if (!hidedefault) {
if (result.data && result.data.displayname) { if (result.data && result.data.displayname) {
$div.imageplaceholder(user, result.data.displayname); $div.imageplaceholder(user, result.data.displayname);
@ -94,6 +96,7 @@
} else { } else {
$div.hide(); $div.hide();
} }
// else an image is transferred and should be shown
} else { } else {
$div.show(); $div.show();
if (ie8fix === true) { if (ie8fix === true) {

Loading…
Cancel
Save