Settings.js: support newlines in default values when using variable substitution

This allows, among other things, to correctly support the configuration of
defaultPadText in Docker via an environment variable.
This commit is contained in:
Paul Tiedtke 2020-03-27 06:33:39 +01:00 committed by muxator
parent 3872690715
commit 79406051fa
4 changed files with 11 additions and 2 deletions

View file

@ -65,6 +65,10 @@
* "password": "${PASSW}" // if PASSW is not defined would result in password === null
* "password": "${PASSW:}" // if PASSW is not defined would result in password === ''
*
* 3) if you want to use newlines in the default value of a string parameter,
* use "\n" as usual.
*
* "defaultPadText" : "${DEFAULT_PAD_TEXT}Line 1\nLine 2"
*/
{
/*
@ -159,7 +163,7 @@
/*
* The default text of a pad
*/
"defaultPadText" : "Welcome to Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at http:\/\/etherpad.org\n",
"defaultPadText" : "${DEFAULT_PAD_TEXT:Welcome to Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at http:\/\/etherpad.org\n}",
/*
* Default Pad behavior.