✨ Vditor 所见即所得模式支持链接引用定义 Vanessa219/vditor#55

88250 · Mar 7, 2020 · ba2aca0 · ba2aca0
1 parent c53da05
commit ba2aca0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/javascript/lute.min.js b/javascript/lute.min.js
diff --git a/javascript/lute.min.js.map b/javascript/lute.min.js.map
diff --git a/test/m2v_test.go b/test/m2v_test.go
@@ -18,6 +18,7 @@ import (
 
 var md2VditorTests = []parseTest{
 
+	{"11", "[foo][1]\n\n[1]: /bar\n", "<p data-block=\"0\"><span data-type=\"link-ref\" data-link-text=\"foo\" data-link-label=\"1\">foo</span>\n</p><p data-block=\"0\" data-type=\"link-ref-defs\">[1]: /bar\n</p>"},
 	{"10", "Foo\n    ---\n", "<p data-block=\"0\">Foo\n---\n</p>"},
 	{"9", "    ***\n     ***\n\n-     -      -      -", "<div class=\"vditor-wysiwyg__block\" data-type=\"code-block\" data-block=\"0\" data-marker=\"***\n ***\n\"><pre><code>***\n ***\n</code></pre></div><hr data-block=\"0\" />"},
 	{"8", "    ***\n", "<div class=\"vditor-wysiwyg__block\" data-type=\"code-block\" data-block=\"0\" data-marker=\"***\n\"><pre><code>***\n</code></pre></div>"},

diff --git a/test/spinv_test.go b/test/spinv_test.go
@@ -20,7 +20,7 @@ import (
 
 var spinVditorDOMTests = []*parseTest{
 
-	{"105", "<p data-block=\"0\">[1]</p><p data-block=\"0\" data-type=\"linkRefDefs\">[1]: f<wbr>\n</p>", "<p data-block=\"0\"><a href=\"\"baz\"\">foo</a>\n</p>"},
+	{"105", "<p data-block=\"0\">[1]</p><p data-block=\"0\" data-type=\"linkRefDefs\">[1]: f<wbr>\n</p>", "<p data-block=\"0\"><span data-type=\"link-ref\" data-link-text=\"1\" data-link-label=\"1\">1</span>\n</p><p data-block=\"0\" data-type=\"link-ref-defs\">[1]: f<wbr>\n</p>"},
 	{"104", "<a href=\"\" title=\"baz\">foo</a>", "<p data-block=\"0\"><a href=\"\"baz\"\">foo</a>\n</p>"},
 	{"103", "<p data-block=\"0\"><strong data-marker=\"**\">foo\n<em data-marker=\"*\">ba<wbr></em></strong>\n</p>", "<p data-block=\"0\"><strong data-marker=\"**\">foo\n<em data-marker=\"*\">ba<wbr></em></strong>\n</p>"},
 	{"102", "<p data-block=\"0\"><strong data-marker=\"**\">foo<em>\u200b\nb<wbr></em></strong>\n</p>", "<p data-block=\"0\"><strong data-marker=\"**\">foo\n<em data-marker=\"*\">b<wbr></em></strong>\n</p>"},

diff --git a/vditor.go b/vditor.go
@@ -804,13 +804,8 @@ func (lute *Lute) genASTByVditorDOM(n *html.Node, tree *parse.Tree) {
 			node.Tokens = codeTokens
 			tree.Context.Tip.AppendChild(node)
 		} else if "link-ref" == dataType {
-			node.Type = ast.NodeLink
-			node.AppendChild(&ast.Node{Type: ast.NodeOpenBracket})
-			node.AppendChild(&ast.Node{Type: ast.NodeLinkText, Tokens: []byte(lute.domAttrValue(n, "link-text"))})
-			node.AppendChild(&ast.Node{Type: ast.NodeCloseBracket})
-			node.AppendChild(&ast.Node{Type: ast.NodeOpenBracket})
-			node.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: []byte(lute.domAttrValue(n, "link-label"))})
-			node.AppendChild(&ast.Node{Type: ast.NodeCloseBracket})
+			node.Type = ast.NodeText
+			node.Tokens = []byte("[" + lute.domAttrValue(n, "link-text") + "][" + lute.domAttrValue(n, "link-label") + "]")
 			tree.Context.Tip.AppendChild(node)
 		}
 		return