From 751e99512a379a6e0cfb3d6b35f897a36a49f251 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 26 Jan 2016 12:59:58 +0100 Subject: [PATCH] Hide the delete button, until we know its a custom avatar --- settings/js/personal.js | 17 ++++++++--------- settings/templates/personal.php | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/settings/js/personal.js b/settings/js/personal.js index 3e1a0d7497..65bc88d209 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -100,7 +100,7 @@ function updateAvatar (hidedefault) { $displaydiv.css({'background-color': ''}); $displaydiv.avatar(OC.currentUser, 145, true); - $('#removeavatar').show(); + $('#removeavatar').removeClass('hidden').addClass('inlineblock'); } function showAvatarCropper () { @@ -303,7 +303,7 @@ $(document).ready(function () { url: OC.generateUrl('/avatar/'), success: function () { updateAvatar(true); - $('#removeavatar').hide(); + $('#removeavatar').addClass('hidden').removeClass('inlineblock'); } }); }); @@ -327,15 +327,14 @@ $(document).ready(function () { ] }); - // does the user have a custom avatar? if he does hide #removeavatar - // needs to be this complicated because we can't check yet if an avatar has been loaded, because it's async - var url = OC.generateUrl( + // does the user have a custom avatar? if he does show #removeavatar + $.get(OC.generateUrl( '/avatar/{user}/{size}', {user: OC.currentUser, size: 1} - ); - $.get(url, function (result) { - if (typeof(result) === 'object') { - $('#removeavatar').hide(); + ), function (result) { + if (typeof(result) === 'string') { + // Show the delete button when the avatar is custom + $('#removeavatar').removeClass('hidden').addClass('inlineblock'); } }); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 5bae01742b..65b8b81aa9 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -41,7 +41,7 @@
-
+

t('png or jpg, max. 20 MB')); ?>