Commit ddaac531 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix-multiple-dropzone-icons' into 'master'

Do not add the same icon multiple times to dropzones

Some DOM queries were to broad which caused paperclip icons and spinners
to be added multiple times to a dropzone in case of multiple dropzones
on a page.

![gitlab-dropzone-icon-bug](https://gitlab.com/dgerhardt/gitlab-ce/uploads/23e558a375cece21cc7af410e3839e05/gitlab-dropzone-icon-bug.png)

Steps to reproduce:
1. Open an existing issue or merge request with comments.
2. Move a file over the new comment dropzone. One paperclip icon should appear.
3. Now click the edit button for an existing comment and repeat step 2. You should see two paperclips.

Fixes #1725.

See merge request !959
parents b5e2dd6f 1ea2dfa5
...@@ -25,10 +25,10 @@ class @DropzoneInput ...@@ -25,10 +25,10 @@ class @DropzoneInput
form_dropzone = $(form).find('.div-dropzone') form_dropzone = $(form).find('.div-dropzone')
form_dropzone.parent().addClass "div-dropzone-wrapper" form_dropzone.parent().addClass "div-dropzone-wrapper"
form_dropzone.append divHover form_dropzone.append divHover
$(".div-dropzone-hover").append iconPaperclip form_dropzone.find(".div-dropzone-hover").append iconPaperclip
form_dropzone.append divSpinner form_dropzone.append divSpinner
$(".div-dropzone-spinner").append iconSpinner form_dropzone.find(".div-dropzone-spinner").append iconSpinner
$(".div-dropzone-spinner").css form_dropzone.find(".div-dropzone-spinner").css
"opacity": 0 "opacity": 0
"display": "none" "display": "none"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment