Merge branch 'master' into appframework-master
This commit is contained in:
commit
6979fd343b
|
@ -33,7 +33,7 @@ class Controller {
|
|||
$image->show();
|
||||
} else {
|
||||
// Signalizes $.avatar() to display a defaultavatar
|
||||
\OC_JSON::success();
|
||||
\OC_JSON::success(array("data"=> array("displayname"=> \OC_User::getDisplayName($user)) ));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -69,7 +69,11 @@
|
|||
var url = OC.Router.generate('core_avatar_get', {user: user, size: size})+'?requesttoken='+oc_requesttoken;
|
||||
$.get(url, function(result) {
|
||||
if (typeof(result) === 'object') {
|
||||
$div.placeholder(user);
|
||||
if (result.data && result.data.displayname) {
|
||||
$div.placeholder(user, result.data.displayname);
|
||||
} else {
|
||||
$div.placeholder(user);
|
||||
}
|
||||
} else {
|
||||
if (ie8fix === true) {
|
||||
$div.html('<img src="'+url+'#'+Math.floor(Math.random()*1000)+'">');
|
||||
|
|
|
@ -34,6 +34,7 @@ function changeDisplayName(){
|
|||
$('#oldDisplayName').text($('#displayName').val());
|
||||
// update displayName on the top right expand button
|
||||
$('#expandDisplayName').text($('#displayName').val());
|
||||
updateAvatar();
|
||||
}
|
||||
else{
|
||||
$('#newdisplayname').val(data.data.displayName);
|
||||
|
|
|
@ -11,7 +11,21 @@
|
|||
<directory suffix=".php">..</directory>
|
||||
<exclude>
|
||||
<directory suffix=".php">../3rdparty</directory>
|
||||
<directory suffix=".php">../apps/files/l10n</directory>
|
||||
<directory suffix=".php">../apps/files_external/l10n</directory>
|
||||
<directory suffix=".php">../apps/files_external/3rdparty</directory>
|
||||
<directory suffix=".php">../apps/files_versions/l10n</directory>
|
||||
<directory suffix=".php">../apps/files_encryption/l10n</directory>
|
||||
<directory suffix=".php">../apps/files_encryption/3rdparty</directory>
|
||||
<directory suffix=".php">../apps/files_sharing/l10n</directory>
|
||||
<directory suffix=".php">../apps/files_trashbin/l10n</directory>
|
||||
<directory suffix=".php">../apps/user_ldap/l10n</directory>
|
||||
<directory suffix=".php">../apps/user_webdavauth/l10n</directory>
|
||||
<directory suffix=".php">../lib/MDB2</directory>
|
||||
<directory suffix=".php">../lib/l10n</directory>
|
||||
<directory suffix=".php">../core/l10n</directory>
|
||||
<directory suffix=".php">../settings/l10n</directory>
|
||||
<directory suffix=".php">../tests</directory>
|
||||
</exclude>
|
||||
</whitelist>
|
||||
</filter>
|
||||
|
|
Loading…
Reference in New Issue