diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-23 11:56:28 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-23 11:56:28 +0000 |
commit | 9931ef4a8a9fa9544729fe39cb3572d278819c8d (patch) | |
tree | 6e3289f8d440402e74dfd16c2293b6895e988e4a /app | |
parent | 27319ffca2510aaa9f8cbcb545550781b61cc1e5 (diff) | |
parent | 1d30e5e96434a0b9506baeda29680f347be11556 (diff) | |
download | gitlab-ce-9931ef4a8a9fa9544729fe39cb3572d278819c8d.tar.gz |
Merge branch 'fix-escaped-text-replacement' into 'master'
Fix escaped text replacement
Closes #37724
See merge request gitlab-org/gitlab-ce!14193
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/notes.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 9c008da1a5d..5a6868be444 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -1280,10 +1280,12 @@ export default class Notes { * Get data from Form attributes to use for saving/submitting comment. */ getFormData($form) { + const content = $form.find('.js-note-text').val(); return { formData: $form.serialize(), - formContent: _.escape($form.find('.js-note-text').val()), + formContent: _.escape(content), formAction: $form.attr('action'), + formContentOriginal: content, }; } @@ -1415,7 +1417,7 @@ export default class Notes { const isMainForm = $form.hasClass('js-main-target-form'); const isDiscussionForm = $form.hasClass('js-discussion-note-form'); const isDiscussionResolve = $submitBtn.hasClass('js-comment-resolve-button'); - const { formData, formContent, formAction } = this.getFormData($form); + const { formData, formContent, formAction, formContentOriginal } = this.getFormData($form); let noteUniqueId; let systemNoteUniqueId; let hasQuickActions = false; @@ -1574,7 +1576,7 @@ export default class Notes { $form = $notesContainer.parent().find('form'); } - $form.find('.js-note-text').val(formContent); + $form.find('.js-note-text').val(formContentOriginal); this.reenableTargetFormSubmitButton(e); this.addNoteError($form); }); |