This commit is contained in:
the-djmaze 2022-05-17 11:08:05 +02:00
parent c1bed26fd1
commit 593d3af6d4
2 changed files with 3 additions and 9 deletions

View file

@ -460,7 +460,6 @@ class SquireUI
// Move cursor above signature
div.before(br);
div.before(br.cloneNode());
this.setCursorAt(br);
}
this._prev_txt_sig = signature;
} catch (e) {
@ -475,14 +474,9 @@ class SquireUI
setData(html) {
// this.plain.value = html;
const squire = this.squire,
root = squire.getRoot();
const squire = this.squire;
squire.setHTML(trimLines(html));
this.setCursorAt(root);
}
setCursorAt(node) {
const squire = this.squire,
const node = squire.getRoot(),
range = squire.getSelection();
range.setStart(node, 0);
range.setEnd(node, 0);

View file

@ -842,7 +842,7 @@ export class ComposePopupView extends AbstractViewPopup {
.replace(/{{DATE}}/g, new Date().format('LLLL'))
.replace(/{{TIME}}/g, new Date().format('LT'))
.replace(/{{MOMENT:[^}]+}}/g, '');
editor.setSignature(signature, isHtml, !!identity.signatureInsertBefore());
signature.length && editor.setSignature(signature, isHtml, !!identity.signatureInsertBefore());
});
}
}