|
|
@@ -342,25 +342,26 @@ func removeTables(entryContent string) string {
|
|
|
return entryContent
|
|
|
}
|
|
|
|
|
|
- var table *goquery.Selection
|
|
|
+ selectors := []string{"table", "tbody", "thead", "td", "th", "td"}
|
|
|
|
|
|
- for {
|
|
|
- table = doc.Find("table").First()
|
|
|
+ var loopElement *goquery.Selection
|
|
|
|
|
|
- if table.Length() == 0 {
|
|
|
- break
|
|
|
- }
|
|
|
-
|
|
|
- td := table.Find("td").First()
|
|
|
+ for _, selector := range selectors {
|
|
|
+ for {
|
|
|
+ loopElement = doc.Find(selector).First()
|
|
|
|
|
|
- if td.Length() == 0 {
|
|
|
- break
|
|
|
- }
|
|
|
+ if loopElement.Length() == 0 {
|
|
|
+ break
|
|
|
+ }
|
|
|
|
|
|
- tdHtml, _ := td.Html()
|
|
|
+ innerHtml, err := loopElement.Html()
|
|
|
+ if err != nil {
|
|
|
+ break
|
|
|
+ }
|
|
|
|
|
|
- table.Parent().AppendHtml(tdHtml)
|
|
|
- table.Remove()
|
|
|
+ loopElement.Parent().AppendHtml(innerHtml)
|
|
|
+ loopElement.Remove()
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
output, _ := doc.Find("body").First().Html()
|