🐛 列表项批量缩进和取消缩进 Vanessa219/vditor#761 siyuan-note/siyuan#56

88250 · Nov 20, 2020 · 75d4fc7 · 75d4fc7
1 parent 4f03923
commit 75d4fc7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 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/spinv_ir_block_test.go b/test/spinv_ir_block_test.go
@@ -19,6 +19,7 @@ import (
 
 var spinVditorIRBlockDOMTests = []*parseTest{
 
+	{"73", "<ul data-tight=\"true\" data-marker=\"*\" data-block=\"0\" data-node-id=\"20201121002137-7zi1s7k\" data-type=\"ul\"><li data-marker=\"*\" data-node-id=\"20201121002110-d5d301s\">foo<ul data-tight=\"true\" data-marker=\"*\" data-block=\"0\" data-node-id=\"20201121002234-adzkdxp\" data-type=\"ul\"><li data-marker=\"*\" data-node-id=\"20201121002205-yjh6pxz\">baz</li></ul><ul data-block=\"0\"><li data-node-id=\"20201121002110-qi7er7i\" data-marker=\"*\"><wbr>bar</li><li data-node-id=\"20201121002114-tor524t\" data-marker=\"*\">bazz</li></ul></li></ul>", "<ul data-tight=\"true\" data-marker=\"*\" data-block=\"0\" data-node-id=\"20201121002137-7zi1s7k\" data-type=\"ul\"><li data-marker=\"*\" data-node-id=\"20201121002110-d5d301s\">foo<ul data-tight=\"true\" data-marker=\"*\" data-block=\"0\" data-node-id=\"20201121002234-adzkdxp\" data-type=\"ul\"><li data-marker=\"*\" data-node-id=\"20201121002205-yjh6pxz\">baz</li><li data-marker=\"*\" data-node-id=\"20201121002110-qi7er7i\"><wbr>bar</li><li data-marker=\"*\" data-node-id=\"20201121002114-tor524t\">bazz</li></ul></li></ul>"},
 	{"72", "<p data-block=\"0\" data-node-id=\"20060102150405-1a2b3c4\" data-type=\"p\"><span><span class=\"vditor-ir__node\" data-type=\"img\"><span class=\"vditor-ir__marker\">!</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">[</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">foo</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">]</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">(</span><span class=\"vditor-ir__marker vditor-ir__marker--link\">bar</span> <span class=\"vditor-ir__marker vditor-ir__marker--title\">\"baz\"</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">)</span><img src=\"bar\" alt=\"foo\" /><span data-render=\"1\">baz</span></span></span></p>", "<p data-block=\"0\" data-node-id=\"20060102150405-1a2b3c4\" data-type=\"p\"><span><span class=\"vditor-ir__node\" data-type=\"img\"><span class=\"vditor-ir__marker\">!</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">[</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">foo</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">]</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">(</span><span class=\"vditor-ir__marker vditor-ir__marker--link\">bar</span> <span class=\"vditor-ir__marker vditor-ir__marker--title\">\"baz\"</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">)</span><img src=\"http://127.0.0.1:6807/siyuan/0/测试笔记/bar\" alt=\"foo\" /><span data-render=\"1\">baz</span></span></span></p>"},
 	{"71", "<p data-block=\"0\" data-node-id=\"20201118233324-cfqmq3n\" data-type=\"p\"><audio controls=\"controls\" src=\"assets/20201118233326-ulhglhc-record1605713606242.wav\"></audio><wbr>\n</p>", "<div data-block=\"0\" data-node-id=\"20060102150405-1a2b3c4\" data-type=\"html-block\"><pre class=\"vditor-ir__marker--pre vditor-ir__marker\"><code data-type=\"html-block\">&lt;audio controls=&quot;controls&quot; src=&quot;assets/20201118233326-ulhglhc-record1605713606242.wav&quot;&gt;&lt;/audio&gt;</code></pre><pre class=\"vditor-ir__preview\" data-render=\"2\"><audio controls=\"controls\" src=\"assets/20201118233326-ulhglhc-record1605713606242.wav\"></audio></pre></div><p data-block=\"0\" data-node-id=\"20201118233324-cfqmq3n\" data-type=\"p\"><wbr></p>"},
 	{"70", "<p data-block=\"0\" data-node-id=\"20201112163727-8ba6arn\" data-type=\"p\"><span data-type=\"block-ref\" class=\"vditor-ir__node\"><span class=\"vditor-ir__marker vditor-ir__marker--paren\">(</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">(</span><span class=\"vditor-ir__marker vditor-ir__marker--link\">20201112162410-uhvgnwu</span><span class=\"vditor-ir__marker\"> </span><span class=\"vditor-ir__marker\">\"</span><span class=\"vditor-ir__blockref\">foo*bar*<wbr></span><span class=\"vditor-ir__marker\">\"</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">)</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">)</span></span></p>", "<p data-block=\"0\" data-node-id=\"20201112163727-8ba6arn\" data-type=\"p\"><span data-type=\"block-ref\" class=\"vditor-ir__node vditor-ir__node--expand\"><span class=\"vditor-ir__marker vditor-ir__marker--paren\">(</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">(</span><span class=\"vditor-ir__marker vditor-ir__marker--link\">20201112162410-uhvgnwu</span><span class=\"vditor-ir__marker\"> </span><span class=\"vditor-ir__marker\">\"</span><span class=\"vditor-ir__blockref\">foo<span data-type=\"em\" class=\"vditor-ir__node vditor-ir__node--expand\"><span class=\"vditor-ir__marker vditor-ir__marker--em\">*</span><em data-newline=\"1\">bar</em><span class=\"vditor-ir__marker vditor-ir__marker--em\">*</span></span><wbr></span><span class=\"vditor-ir__marker\">\"</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">)</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">)</span></span></p>"},

diff --git a/vditor_wysiwyg.go b/vditor_wysiwyg.go
@@ -257,9 +257,11 @@ func (lute *Lute) mergeVditorDOMList0(n *html.Node) {
 	switch n.DataAtom {
 	case atom.Ul, atom.Ol:
 		if nil != n.NextSibling && n.DataAtom == n.NextSibling.DataAtom && 1 == len(n.NextSibling.Attr) {
-			for c := n.NextSibling.FirstChild; nil != c; c = c.NextSibling {
+			for c := n.NextSibling.FirstChild; nil != c;  {
+				next := c.NextSibling
 				c.Unlink()
 				n.AppendChild(c)
+				c = next
 			}
 			n.NextSibling.Unlink()
 		}