diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-17 13:20:30 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-17 13:20:30 -0500 |
| commit | 9ed1cbf2176bcab22d522373b2830338dc5c7c69 (patch) | |
| tree | 56691bef42699e0824119a128f56e28fcbe82452 | |
| parent | 358545b8d2b41b24bdb8dc581f9541122212ae56 (diff) | |
| download | gitlab-ce-9ed1cbf2176bcab22d522373b2830338dc5c7c69.tar.gz | |
Show filename after setting a cropped image
| -rw-r--r-- | app/assets/javascripts/gl_crop.js.coffee | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/app/assets/javascripts/gl_crop.js.coffee b/app/assets/javascripts/gl_crop.js.coffee index 276e56b4349..4d990a6416a 100644 --- a/app/assets/javascripts/gl_crop.js.coffee +++ b/app/assets/javascripts/gl_crop.js.coffee @@ -5,9 +5,9 @@ class GitLabCrop # Set defaults { - @filename - @previewImage = $('.avatar-image .avatar') @form = @fileInput.parents('form') + @filename = '.js-avatar-filename' + @previewImage = $('.avatar-image .avatar') @modalCrop = '.modal-profile-crop' @exportWidth = 200 @exportHeight = 200 @@ -20,13 +20,20 @@ class GitLabCrop @uploadImageBtn = $('.js-upload-user-avatar') } = opts - # Ensure @modalCrop is a jQuery Object - @modalCrop = $(@modalCrop) + # Ensure needed elements are jquery objects + @filename = if _.isString(@filename) then @$(@filename) else @filename + + # Modal usually is outside the wrapper element + @modalCrop = if _.isString(@modalCrop) then $(@modalCrop) else @modalCrop + @modalCropImg = $('.modal-profile-crop-image') @cropActionsBtn = @modalCrop.find('[data-method]') @bindEvents() + $: (selector) -> + $(selector, @form) + bindEvents: -> self = @ @fileInput.on 'change', (e) -> @@ -114,6 +121,8 @@ class GitLabCrop setPreview: -> @previewImage.attr('src', @dataURL) + filename = @fileInput.val().replace(/^.*[\\\/]/, '') + @filename.text(filename) setBlob: -> @dataURL = @modalCropImg.cropper('getCroppedCanvas', |