diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-21 10:36:24 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-21 10:36:24 +0000 |
| commit | cfde0936ea20edab82081c3f1288098c882e7de9 (patch) | |
| tree | 1b7ec6381cc7e0255a17322804c78241d6d8b0c2 | |
| parent | 72f50fcb2c94d0ca6e9bdc402207af43f0f8472c (diff) | |
| parent | 824821b4e9e29986de517b528759630b7fd11780 (diff) | |
| download | gitlab-ce-cfde0936ea20edab82081c3f1288098c882e7de9.tar.gz | |
Merge branch 'file-upload-bugfix' into 'master'
Bugfix for Multiple File Upload Dialogs
Fixes issue #426, where a page with multiple dropzones can accidentally trigger multiple file upload dialogs when the user clicks the "selecting them" link.
By specifying the closest "div-dropzone-wrapper" before sending a click to "div-dropzone", duplicate events are prevented from firing.
See merge request !153
| -rw-r--r-- | app/assets/javascripts/markdown_area.js.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/markdown_area.js.coffee b/app/assets/javascripts/markdown_area.js.coffee index 516a40b25c2..1449735fae9 100644 --- a/app/assets/javascripts/markdown_area.js.coffee +++ b/app/assets/javascripts/markdown_area.js.coffee @@ -179,7 +179,7 @@ $(document).ready -> $(".markdown-selector").click (e) -> e.preventDefault() - $(".div-dropzone").click() + $(@).closest(".div-dropzone-wrapper").find(".div-dropzone").click() return return |