Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:laurent22/joplin

pull/235/merge
Laurent Cozic 2018-02-18 21:16:26 +00:00
parent 0addd86069 fc6558a64c
commit 8f4060999f
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ElectronClient/app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "Joplin",
"version": "1.0.64",
"version": "1.0.65",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
ElectronClient/app/package.json
View File

@ -1,6 +1,6 @@
{
"name": "Joplin",
"version": "1.0.64",
"version": "1.0.65",
"description": "Joplin for Desktop",
"main": "main.js",
"scripts": {

5
ReactNativeClient/lib/MdToHtml.js
View File

@ -208,6 +208,8 @@ class MdToHtml {
openTag = null;
} else if (isInlineCode) {
openTag = null;
} else if (tag && t.type.indexOf('html_inline') >= 0) {
openTag = null;
} else if (tag && t.type.indexOf('_open') >= 0) {
openTag = tag;
} else if (tag && t.type.indexOf('_close') >= 0) {
@ -266,6 +268,8 @@ class MdToHtml {
if (t.type === 'image') {
if (tokenContent) attrs.push(['title', tokenContent]);
output.push(this.renderImage_(attrs, options));
} else if (t.type === 'html_inline') {
output.push(t.content);
} else if (t.type === 'softbreak') {
output.push('<br/>');
} else if (t.type === 'hr') {
@ -351,6 +355,7 @@ class MdToHtml {
const md = new MarkdownIt({
breaks: true,
linkify: true,
html: true,
});
// This is currently used only so that the $expression$ and $$\nexpression\n$$ blocks are translated

9
ReactNativeClient/lib/import-enex-md-gen.js
View File

@ -617,10 +617,6 @@ function enexXmlToMdArray(stream, resources) {
});
}
function removeTableCellNewLines(cellText) {
return cellText.replace(/\n+/g, " ");
}
function tableHasSubTables(table) {
for (let trIndex = 0; trIndex < table.lines.length; trIndex++) {
const tr = table.lines[trIndex];
@ -689,8 +685,9 @@ function drawTable(table) {
line.push(BLOCK_CLOSE);
} else { // Regular table rendering
// A cell in a Markdown table cannot have new lines so remove them
const cellText = removeTableCellNewLines(processMdArrayNewLines(td.lines));
// A cell in a Markdown table cannot have actual new lines so replace
// them with <br>, which are supported by the markdown renderers.
const cellText = processMdArrayNewLines(td.lines).replace(/\n+/g, "<br>");
const width = Math.max(cellText.length, 3);
line.push(stringPadding(cellText, width, ' ', stringPadding.RIGHT));