Merge pull request #858 from hgiesel/editorwhitespace

Remove placeholder `<br>`s in empty fields in editor
This commit is contained in:
Damien Elmes 2020-12-28 16:50:23 +10:00 committed by GitHub
commit 7397b9c0c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 21 deletions

View File

@ -7,9 +7,14 @@
padding: 5px;
overflow-wrap: break-word;
overflow: auto;
&:empty::after {
content: "\A";
white-space: pre;
}
}
.clearfix:after {
.clearfix::after {
content: "";
display: table;
clear: both;

View File

@ -115,11 +115,6 @@ function inPreEnvironment() {
}
function onInput() {
// empty field?
if (currentField.innerHTML === "") {
currentField.innerHTML = "<br>";
}
// make sure IME changes get saved
triggerKeyTimer();
}
@ -335,9 +330,6 @@ function setFields(fields) {
for (let i = 0; i < fields.length; i++) {
const n = fields[i][0];
let f = fields[i][1];
if (!f) {
f = "<br>";
}
txt += `
<tr>
<td class=fname id="name${i}">
@ -400,20 +392,12 @@ function hideDupes() {
$("#dupes").hide();
}
/// If the field has only an empty br, remove it first.
let insertHtmlRemovingInitialBR = function (html: string) {
if (html !== "") {
// remove <br> in empty field
if (currentField && currentField.innerHTML === "<br>") {
currentField.innerHTML = "";
}
setFormat("inserthtml", html);
}
};
let pasteHTML = function (html, internal, extendedMode) {
html = filterHTML(html, internal, extendedMode);
insertHtmlRemovingInitialBR(html);
if (html !== "") {
setFormat("inserthtml", html);
}
};
let filterHTML = function (html, internal, extendedMode) {