Merge remote-tracking branch 'upstream/master'

This commit is contained in:
monkeytypegeorge 2021-01-19 01:04:12 +00:00
commit 162449279a
2 changed files with 6 additions and 5 deletions

View file

@ -668,6 +668,10 @@ async function initWords() {
}
randomQuote = rq;
randomQuote.text = randomQuote.text.replace(/ +/gm, " ");
randomQuote.text = randomQuote.text.replace(/\\\\t/gm, "\t");
randomQuote.text = randomQuote.text.replace(/\\\\n/gm, "\n");
randomQuote.text = randomQuote.text.replace(/\\t/gm, "\t");
randomQuote.text = randomQuote.text.replace(/\\n/gm, "\n");
randomQuote.text = randomQuote.text.replace(/( *(\r\n|\r|\n) *)/g, "\n ");
let w = randomQuote.text.trim().split(" ");
for (let i = 0; i < w.length; i++) {
@ -4069,6 +4073,8 @@ $("#customTextPopup .button").click(() => {
// text = text.replace(/[\r]/gm, " ");
text = text.replace(/\\\\t/gm, "\t");
text = text.replace(/\\\\n/gm, "\n");
text = text.replace(/\\t/gm, "\t");
text = text.replace(/\\n/gm, "\n");
text = text.replace(/ +/gm, " ");
// text = text.replace(/(\r\n)+/g, "\r\n");
// text = text.replace(/(\n)+/g, "\n");

View file

@ -1592,11 +1592,6 @@
<key>esc</key>
)
</div>
<div style="text-align: center">
For testing purposes, account config synchronisation has been
temporarily disabled (only local config will be remembered). Sorry
for the inconvenience.
</div>
<!-- <div class="sectionGroupTitle">quick navigation</div> -->
<div class="settingsGroup quickNav">
<div class="links">