diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-07-18 06:06:59 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-07-18 06:06:59 +0000 |
| commit | 895d988d55f3eacac45fdc53f1699cae3af6c06d (patch) | |
| tree | bb349d767f968698c8942072462c8136a3e7d685 | |
| parent | 6615428679b28e9d6c6cf5dd887280b092fbdded (diff) | |
| parent | 782500158608eba36e27f53e1d8822d25710fe80 (diff) | |
| download | gitlab-ce-895d988d55f3eacac45fdc53f1699cae3af6c06d.tar.gz | |
Merge branch 'fix-note-edit-upload-link' into 'master'
Fix file upload dialog for comment editing
This fixes the file upload dialog which currently works for new comments
but not for comment editing. The cause for this is a missing DOM class
which causes traversal to the dropzone to fail.
This is fixed by adding the expected `gfm-form` class to the edit form.
It has to be added dynamically since adding it to the form template
would break the form's layout and comment saving.
The following screenshot illustrates the issue:
See merge request !956
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 001d5350bad..c4877042fed 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.14.0 (unreleased) + - Fix file upload dialog for comment editing (Daniel Gerhardt) - Expire Rails cache entries after two weeks to prevent endless Redis growth - Add support for destroying project milestones (Stan Hu) diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index 1c05a2b9fe8..bcff7bcc49e 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -298,7 +298,7 @@ class @Notes note.find(".note-header").hide() base_form = note.find(".note-edit-form") form = base_form.clone().insertAfter(base_form) - form.addClass('current-note-edit-form') + form.addClass('current-note-edit-form gfm-form') form.find('.div-dropzone').remove() # Show the attachment delete link |