sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better handling of newlines which should hopefully eliminate new line duplication

pull/255/head
azivner 2017-08-25 20:40:33 +07:00
parent 1b3a113639
commit bf22cc55e1
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
static/js/html2notecase.js
Unescape Escape View File

@ -1,7 +1,11 @@
function html2notecase(contents, note) {
//console.log("'" + contents + "'");
// remove any possible extra newlines which might be inserted - all relevant new lines should be only in <br> and <p>
contents = contents.replace(/(?:\r\n|\r|\n)/, '');
contents = contents.replace(/<br><\/p>/g, '\n');
contents = contents.replace(/<p><br><\/p>/g, '\n');
contents = contents.replace(/<br \/>/g, '\n');
contents = contents.replace(/<br>/g, '\n');
contents = contents.replace(/<\/p>/g, '\n');
@ -144,7 +148,9 @@ function html2notecase(contents, note) {
}
}
//console.log(contents);
contents = contents.trim();
//console.log('"' + contents + '"');
note.detail.note_text = contents;
}

6
static/js/notecase2html.js
Unescape Escape View File

@ -43,7 +43,11 @@ function notecase2html(note) {
}
}
noteText = noteText.replace(/(?:\r\n|\r|\n)/g, '<br />');
noteText = noteText.replace(/(?:\r\n|\r)/g, '\n');
noteText = noteText.replace(/(.+)\n/g, '<p>$1</p>');
noteText = noteText.replace(/\n/g, '<p><br></p>');
noteText = noteText.replace(/ /g, '&nbsp;&nbsp;');