aboutsummaryrefslogtreecommitdiffstats
path: root/settings/js/personal.js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-10-04 14:06:42 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-10-04 14:06:42 +0200
commitaebc330f269f3e88f2891cd13009cde2d50eb59a (patch)
tree7398bc68d581d01b18ba3e9e79c82491f1ecf871 /settings/js/personal.js
parentc62dc4fa80d622ed7651029e9ddff2a6c6327143 (diff)
parent800bf0769ff4ea63c5dcc77eaaf1bce669b73d13 (diff)
downloadnextcloud-server-aebc330f269f3e88f2891cd13009cde2d50eb59a.tar.gz
nextcloud-server-aebc330f269f3e88f2891cd13009cde2d50eb59a.zip
Merge branch 'master' into fixing-4011-master
Diffstat (limited to 'settings/js/personal.js')
-rw-r--r--settings/js/personal.js12
1 files changed, 8 insertions, 4 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js
index a923b475731..3fdc2907c46 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -45,12 +45,16 @@ function changeDisplayName(){
}
}
-function updateAvatar () {
+function updateAvatar (hidedefault) {
$headerdiv = $('#header .avatardiv');
$displaydiv = $('#displayavatar .avatardiv');
- $headerdiv.css({'background-color': ''});
- $headerdiv.avatar(OC.currentUser, 32, true);
+ if(hidedefault) {
+ $headerdiv.hide();
+ } else {
+ $headerdiv.css({'background-color': ''});
+ $headerdiv.avatar(OC.currentUser, 32, true);
+ }
$displaydiv.css({'background-color': ''});
$displaydiv.avatar(OC.currentUser, 128, true);
}
@@ -232,7 +236,7 @@ $(document).ready(function(){
type: 'DELETE',
url: OC.Router.generate('core_avatar_delete'),
success: function(msg) {
- updateAvatar();
+ updateAvatar(true);
}
});
});