gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 05:28:59 +01:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge pull request #9 from domchristie/tables_with_no_heading_row

Browse Source 
Keep tables with no definitive heading row
This commit is contained in:
Dom Christie 2018-05-11 12:03:16 +01:00 committed by GitHub
commit 22f423429c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tables.js
View File

@ -32,7 +32,12 @@ rules.tableRow = {
} }
rules.table = { rules.table = {
filter: 'table', // Only convert tables with a heading row.
// Tables with no heading row are kept using `keep` (see below).
filter: function (node) {
return node.nodeName === 'TABLE' && isHeadingRow(node.rows[0])
},
replacement: function (content) { replacement: function (content) {
// Ensure there are no blank lines // Ensure there are no blank lines
content = content.replace('\n\n', '\n') content = content.replace('\n\n', '\n')
@ -85,5 +90,8 @@ function cell (content, node) {
} }
export default function tables (turndownService) { export default function tables (turndownService) {
turndownService.keep(function (node) {
return node.nodeName === 'TABLE' && !isHeadingRow(node.rows[0])
})
for (var key in rules) turndownService.addRule(key, rules[key]) for (var key in rules) turndownService.addRule(key, rules[key])
} }

51
test/index.html
View File

@ -151,6 +151,10 @@
<div class="case" data-name="empty rows"> <div class="case" data-name="empty rows">
<div class="input"> <div class="input">
<table> <table>
<thead>
<td>Heading 1</td>
<td>Heading 2</td>
</thead>
<tbody> <tbody>
<tr> <tr>
<td>Row 1</td> <td>Row 1</td>
@ -167,7 +171,9 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<pre class="expected">| Row 1 | Row 1 | <pre class="expected">| Heading 1 | Heading 2 |
| --- | --- |
| Row 1 | Row 1 |
| Row 3 | Row 3 |</pre> | Row 3 | Row 3 |</pre>
</div> </div>
@ -233,23 +239,6 @@
| Content |</pre> | Content |</pre>
</div> </div>
<div class="case" data-name="th in first row">
<div class="input">
<table>
<tr>
<th>Heading</th>
<td>Not a heading</td>
</tr>
<tr>
<td>Heading</td>
<td>Not a heading</td>
</tr>
</table>
</div>
<pre class="expected">| Heading | Not a heading |
| Heading | Not a heading |</pre>
</div>
<div class="case" data-name="heading cells in both thead and tbody"> <div class="case" data-name="heading cells in both thead and tbody">
<div class="input"> <div class="input">
<table> <table>
@ -273,6 +262,32 @@
| --- |</pre> | --- |</pre>
</div> </div>
<div class="case" data-name="non-definitive heading row (not converted)">
<div class="input">
<table>
<tr><td>Row 1 Cell 1</td><td>Row 1 Cell 2</td></tr>
<tr><td>Row 2 Cell 1</td><td>Row 2 Cell 2</td></tr>
</table>
</div>
<pre class="expected">&lt;table&gt;&lt;tbody&gt;&lt;tr&gt;&lt;td&gt;Row 1 Cell 1&lt;/td&gt;&lt;td&gt;Row 1 Cell 2&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Row 2 Cell 1&lt;/td&gt;&lt;td&gt;Row 2 Cell 2&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;</pre>
</div>
<div class="case" data-name="non-definitive heading row with th (not converted)">
<div class="input">
<table>
<tr>
<th>Heading</th>
<td>Not a heading</td>
</tr>
<tr>
<td>Heading</td>
<td>Not a heading</td>
</tr>
</table>
</div>
<pre class="expected">&lt;table&gt;&lt;tbody&gt;&lt;tr&gt;&lt;th&gt;Heading&lt;/th&gt;&lt;td&gt;Not a heading&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Heading&lt;/td&gt;&lt;td&gt;Not a heading&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;</pre>
</div>
<div class="case" data-name="highlighted code block with html"> <div class="case" data-name="highlighted code block with html">
<div class="input"> <div class="input">
<div class="highlight highlight-text-html-basic"> <div class="highlight highlight-text-html-basic">