Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-08-14 04:52:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't render table outline if it contains only one cell, or no cell at all

Browse Source
This commit is contained in:
Laurent Cozic 2018-06-09 19:40:57 +01:00
parent ec895d31fb
commit 11225771b6
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tables.js
View File

@ -5,7 +5,7 @@ var rules = {}
rules.tableCell = { rules.tableCell = {
filter: ['th', 'td'], filter: ['th', 'td'],
replacement: function (content, node) { replacement: function (content, node) {
if (nodeContainsTable(nodeParentTable(node))) return content; if (tableShouldBeSkipped(nodeParentTable(node))) return content;
return cell(content, node) return cell(content, node)
} }
} }
@ -14,7 +14,7 @@ rules.tableRow = {
filter: 'tr', filter: 'tr',
replacement: function (content, node) { replacement: function (content, node) {
const parentTable = nodeParentTable(node); const parentTable = nodeParentTable(node);
if (nodeContainsTable(parentTable)) return content; if (tableShouldBeSkipped(parentTable)) return content;
var borderCells = '' var borderCells = ''
var alignMap = { left: ':--', right: '--:', center: ':-:' } var alignMap = { left: ':--', right: '--:', center: ':-:' }
@ -47,7 +47,7 @@ rules.table = {
}, },
replacement: function (content, node) { replacement: function (content, node) {
if (nodeContainsTable(node)) return content; if (tableShouldBeSkipped(node)) return content;
// If table has no heading, add an empty one so as to get a valid Markdown table // If table has no heading, add an empty one so as to get a valid Markdown table
var firstRow = node.rows.length ? node.rows[0] : null var firstRow = node.rows.length ? node.rows[0] : null
@ -121,6 +121,16 @@ function nodeContainsTable(node) {
return false; return false;
} }
// Various conditions under which a table should be skipped - i.e. each cell
// will be rendered one after the other as if they were paragraphs.
function tableShouldBeSkipped(tableNode) {
if (!tableNode) return true;
if (!tableNode.rows) return true;
if (tableNode.rows.length <= 1 && tableNode.rows[0].childNodes.length <= 1) return true; // Table with only one cell
if (nodeContainsTable(tableNode)) return true;
return false;
}
function nodeParentTable(node) { function nodeParentTable(node) {
let parent = node.parentNode; let parent = node.parentNode;
while (parent.nodeName !== 'TABLE') { while (parent.nodeName !== 'TABLE') {