diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-01-19 10:02:19 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-01-19 10:02:19 -0600 |
| commit | b6ac53322e8562e65bbed3a4decce2dd057a3d1e (patch) | |
| tree | 2d5d17fc455d4a049ed9ab54555dea71cfcdd27a | |
| parent | 9b800bc6418621b601fead1c18dd0a327534c998 (diff) | |
| download | gitlab-ce-b6ac53322e8562e65bbed3a4decce2dd057a3d1e.tar.gz | |
Don't copy as GFM when more than GFM is selected
| -rw-r--r-- | app/assets/javascripts/copy_as_gfm.js.es6 | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/shortcuts_issuable.js | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/copy_as_gfm.js.es6 b/app/assets/javascripts/copy_as_gfm.js.es6 index c55aee39fca..80e30fdf390 100644 --- a/app/assets/javascripts/copy_as_gfm.js.es6 +++ b/app/assets/javascripts/copy_as_gfm.js.es6 @@ -260,6 +260,9 @@ const documentFragment = window.gl.utils.getSelectedFragment(); if (!documentFragment) return; + // If the documentFragment contains more than just Markdown, don't copy as GFM. + if (documentFragment.querySelector('.md, .wiki')) return; + e.preventDefault(); clipboardData.setData('text/plain', documentFragment.textContent); diff --git a/app/assets/javascripts/shortcuts_issuable.js b/app/assets/javascripts/shortcuts_issuable.js index 363379f49ae..6603b9679b9 100644 --- a/app/assets/javascripts/shortcuts_issuable.js +++ b/app/assets/javascripts/shortcuts_issuable.js @@ -44,6 +44,9 @@ documentFragment = window.gl.utils.getSelectedFragment(); if (!documentFragment) return; + // If the documentFragment contains more than just Markdown, don't copy as GFM. + if (documentFragment.querySelector('.md, .wiki')) return; + selected = window.gl.CopyAsGFM.nodeToGFM(documentFragment); replyField = $('.js-main-target-form #note_note'); |