summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-08 19:46:01 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-09 07:50:41 -0600
commit2e040c3ff7046a90ae9687d5a5c1259687be5ff9 (patch)
treee4f633b407efb3c275dcc004d740a5ef27814c7a
parent110cd58999abb45f52273f5870fe16a3ad026746 (diff)
downloadgitlab-ce-2e040c3ff7046a90ae9687d5a5c1259687be5ff9.tar.gz
Correctly transform an anchor link to GFM when copying it
-rw-r--r--app/assets/javascripts/copy_as_gfm.js.es63
-rw-r--r--changelogs/unreleased/copy-as-gfm-anchor-link.yml4
-rw-r--r--spec/features/copy_as_gfm_spec.rb2
3 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/javascripts/copy_as_gfm.js.es6 b/app/assets/javascripts/copy_as_gfm.js.es6
index 2bfe57b4100..4bd537a6f28 100644
--- a/app/assets/javascripts/copy_as_gfm.js.es6
+++ b/app/assets/javascripts/copy_as_gfm.js.es6
@@ -91,6 +91,9 @@ require('./lib/utils/common_utils');
},
},
SanitizationFilter: {
+ 'a[name]:not([href]):empty'(el, text) {
+ return el.outerHTML;
+ },
'dl'(el, text) {
let lines = text.trim().split('\n');
// Add two spaces to the front of subsequent list items lines,
diff --git a/changelogs/unreleased/copy-as-gfm-anchor-link.yml b/changelogs/unreleased/copy-as-gfm-anchor-link.yml
new file mode 100644
index 00000000000..e159e60a7d7
--- /dev/null
+++ b/changelogs/unreleased/copy-as-gfm-anchor-link.yml
@@ -0,0 +1,4 @@
+---
+title: Correctly transform an anchor link to GFM when copying it
+merge_request:
+author:
diff --git a/spec/features/copy_as_gfm_spec.rb b/spec/features/copy_as_gfm_spec.rb
index f3a5b565122..fec86128d03 100644
--- a/spec/features/copy_as_gfm_spec.rb
+++ b/spec/features/copy_as_gfm_spec.rb
@@ -251,6 +251,8 @@ describe 'Copy as GFM', feature: true, js: true do
'SanitizationFilter',
<<-GFM.strip_heredoc
+ <a name="named-anchor"></a>
+
<sub>sub</sub>
<dl>