diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 15:08:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 15:08:47 +0300 |
commit | 5460c19548d3d3d2ff764ceff05c2b72aa2d3a32 (patch) | |
tree | 3a7fff116a7f6ff9c033e7f5e87a4341de801784 /app/assets/javascripts/profile | |
parent | 2fe341d705700b3e99f82076b09b95885878ac0d (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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/profile/gl_crop.js b/app/assets/javascripts/profile/gl_crop.js index 55bc9fb8955..ecb69422287 100644 --- a/app/assets/javascripts/profile/gl_crop.js +++ b/app/assets/javascripts/profile/gl_crop.js @@ -3,6 +3,7 @@ import $ from 'jquery'; import 'cropper'; import { isString } from 'lodash'; +import { loadCSSFile } from '../lib/utils/css_utils'; (() => { // Matches everything but the file name @@ -180,6 +181,9 @@ import { isString } from 'lodash'; } } + const cropModal = document.querySelector('.modal-profile-crop'); + if (cropModal) loadCSSFile(cropModal.dataset.cropperCssPath); + $.fn.glCrop = function(opts) { return this.each(function() { return $(this).data('glcrop', new GitLabCrop(this, opts)); |