diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-31 18:27:28 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-31 18:27:28 +0200 |
| commit | aa88eea9cf366c07b0a311adc5ee64f0ae86ff33 (patch) | |
| tree | dd9a4a47f56e4eb688366a70f1bd0fb7dd2c5a36 /settings | |
| parent | 5d653753bd8f6f1294dfbfa112757e5509ddc80d (diff) | |
| download | nextcloud-server-aa88eea9cf366c07b0a311adc5ee64f0ae86ff33.tar.gz nextcloud-server-aa88eea9cf366c07b0a311adc5ee64f0ae86ff33.zip | |
Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 3 | ||||
| -rw-r--r-- | settings/js/personal.js | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index a2c3eaf6263..7b147d5b960 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -37,9 +37,6 @@ td.name, td.password { padding-left:.8em; } td.password>img,td.displayName>img, td.remove>a, td.quota>img { visibility:hidden; } td.password, td.quota, td.displayName { width:12em; cursor:pointer; } td.password>span, td.quota>span, rd.displayName>span { margin-right: 1.2em; color: #C7C7C7; } -td.avatar img { - margin-top: 6px; -} td.remove { width:1em; padding-right:1em; } tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:pointer; } diff --git a/settings/js/personal.js b/settings/js/personal.js index a62b37d8d48..e2e9c69e430 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -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); @@ -82,7 +83,6 @@ function showAvatarCropper() { } function sendCropData() { - $('#cropperbox').ocdialog('close'); var cropperdata = $('#cropper').data(); var data = { x: cropperdata.x, @@ -90,6 +90,7 @@ function sendCropData() { w: cropperdata.w, h: cropperdata.h }; + $('#cropperbox').remove(); $.post(OC.Router.generate('core_avatar_post_cropped'), {crop: data}, avatarResponseHandler); } |