diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-30 21:08:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-30 21:08:31 +0300 |
| commit | 7510df057e6230ce3d6f20772b0460ca2eb4bd63 (patch) | |
| tree | 68a726ba9b534a51ec92a78be952fce286aead31 /app/assets/javascripts/profile | |
| parent | 4dd542c93535f21d0fde62080be2dd98e3926fb1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/profile')
| -rw-r--r-- | app/assets/javascripts/profile/gl_crop.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/profile/profile.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/profile/gl_crop.js b/app/assets/javascripts/profile/gl_crop.js index 722f7d467a2..050b004f657 100644 --- a/app/assets/javascripts/profile/gl_crop.js +++ b/app/assets/javascripts/profile/gl_crop.js @@ -165,6 +165,7 @@ import { loadCSSFile } from '../lib/utils/css_utils'; setPreview() { const filename = this.fileInput.val().replace(FILENAMEREGEX, ''); this.previewImage.attr('src', this.dataURL); + this.previewImage.attr('srcset', this.dataURL); return this.filename.text(filename); } diff --git a/app/assets/javascripts/profile/profile.js b/app/assets/javascripts/profile/profile.js index bf507c620e6..93bc203d391 100644 --- a/app/assets/javascripts/profile/profile.js +++ b/app/assets/javascripts/profile/profile.js @@ -19,7 +19,7 @@ export default class Profile { initAvatarGlCrop() { const cropOpts = { filename: '.js-avatar-filename', - previewImage: '.avatar-image .avatar', + previewImage: '.avatar-image .gl-avatar', modalCrop: '.modal-profile-crop', pickImageEl: '.js-choose-user-avatar-button', uploadImageBtn: '.js-upload-user-avatar', |