Skip to content

Commit 0add0da

Browse files
committed
fix: #60 remove failed when multi plugin
1 parent f652963 commit 0add0da

File tree

3 files changed

+26
-1
lines changed

3 files changed

+26
-1
lines changed

app/Confluence.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,21 @@ public function htmlFile2Markdown(string $filename): string
5151

5252
$contentElement = $this->document->getElementById('main-content');
5353
$divElements = $contentElement->getElementsByTagName('div');
54+
$needDeleteElements = [];
5455
foreach ($divElements as $divElement) {
5556
if (
5657
in_array($divElement->getAttribute('class'), [
5758
'recently-updated recently-updated-social',
5859
'plugin-contributors',
5960
])
6061
) {
61-
$divElement->parentNode->parentNode->removeChild($divElement->parentNode);
62+
$needDeleteElements[] = $divElement->parentNode;
6263
}
6364
}
65+
for ($i = count($needDeleteElements); $i > 0; $i--) {
66+
$element = $needDeleteElements[$i - 1];
67+
$element->parentNode->removeChild($element);
68+
}
6469
$html = $this->document->saveHTML($contentElement);
6570
return $this->htmlConverter->convert($html);
6671
}

tests/data/confluence/recent-space-activity-demo.html

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,24 @@ <h2 id="首页-Recentspaceactivity">Recent space activity</h2>
101101
</div>
102102
<p></p></div>
103103
</div>
104+
105+
<div class="cell normal" data-type="normal">
106+
<div class="innerCell">
107+
<h2 id="PDA首页-Spacecontributors">Space contributors</h2><p>
108+
</p><div class="plugin-contributors">
109+
<ul class="contributors-list">
110+
<li>
111+
<a href="http://wiki.pagoda.com.cn/display/~20200921007">张三</a> (59天以前) </li>
112+
<li>
113+
<a href="http://wiki.pagoda.com.cn/display/~zhouyi">周1</a> (340天以前) </li>
114+
<li>
115+
<a href="http://wiki.pagoda.com.cn/display/~weiyi">魏1</a> (428天以前) </li>
116+
<li>
117+
<a href="http://wiki.pagoda.com.cn/display/~lisi">李四</a> (736天以前) </li>
118+
</ul>
119+
</div>
120+
<p></p></div>
121+
</div>
104122
<p>Hello World!</p>
105123
</div>
106124

tests/data/confluence/recent-space-activity-demo.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ hello
33

44

55

6+
7+
68
Hello World!

0 commit comments

Comments
 (0)