libretic
/
etherpad-lite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pad: Use `null` as default for `userName`, `userColor` options 

These options are used as strings, so it doesn't make sense to default
them to a boolean value.

Note that this change has no effect due to a bug in how pad options
are processed; that bug will be fixed in a future commit.
This commit is contained in:
Richard Hansen 2021-12-04 21:36:02 -05:00
parent 61b608e264
commit 8c857a85ac
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/docker.md
View File

@ -116,8 +116,8 @@ If your database needs additional settings, you will have to use a personalized
| `PAD_OPTIONS_SHOW_CHAT` | | `true` | | `PAD_OPTIONS_SHOW_CHAT` | | `true` |
| `PAD_OPTIONS_SHOW_LINE_NUMBERS` | | `true` | | `PAD_OPTIONS_SHOW_LINE_NUMBERS` | | `true` |
| `PAD_OPTIONS_USE_MONOSPACE_FONT` | | `false` | | `PAD_OPTIONS_USE_MONOSPACE_FONT` | | `false` |
| `PAD_OPTIONS_USER_NAME` | | `false` | | `PAD_OPTIONS_USER_NAME` | | `null` |
| `PAD_OPTIONS_USER_COLOR` | | `false` | | `PAD_OPTIONS_USER_COLOR` | | `null` |
| `PAD_OPTIONS_RTL` | | `false` | | `PAD_OPTIONS_RTL` | | `false` |
| `PAD_OPTIONS_ALWAYS_SHOW_CHAT` | | `false` | | `PAD_OPTIONS_ALWAYS_SHOW_CHAT` | | `false` |
| `PAD_OPTIONS_CHAT_AND_USERS` | | `false` | | `PAD_OPTIONS_CHAT_AND_USERS` | | `false` |

4
settings.json.docker
View File

@ -234,8 +234,8 @@
"showChat": "${PAD_OPTIONS_SHOW_CHAT:true}", "showChat": "${PAD_OPTIONS_SHOW_CHAT:true}",
"showLineNumbers": "${PAD_OPTIONS_SHOW_LINE_NUMBERS:true}", "showLineNumbers": "${PAD_OPTIONS_SHOW_LINE_NUMBERS:true}",
"useMonospaceFont": "${PAD_OPTIONS_USE_MONOSPACE_FONT:false}", "useMonospaceFont": "${PAD_OPTIONS_USE_MONOSPACE_FONT:false}",
"userName": "${PAD_OPTIONS_USER_NAME:false}", "userName": "${PAD_OPTIONS_USER_NAME:null}",
"userColor": "${PAD_OPTIONS_USER_COLOR:false}", "userColor": "${PAD_OPTIONS_USER_COLOR:null}",
"rtl": "${PAD_OPTIONS_RTL:false}", "rtl": "${PAD_OPTIONS_RTL:false}",
"alwaysShowChat": "${PAD_OPTIONS_ALWAYS_SHOW_CHAT:false}", "alwaysShowChat": "${PAD_OPTIONS_ALWAYS_SHOW_CHAT:false}",
"chatAndUsers": "${PAD_OPTIONS_CHAT_AND_USERS:false}", "chatAndUsers": "${PAD_OPTIONS_CHAT_AND_USERS:false}",

4
settings.json.template
View File

@ -235,8 +235,8 @@
"showChat": true, "showChat": true,
"showLineNumbers": true, "showLineNumbers": true,
"useMonospaceFont": false, "useMonospaceFont": false,
"userName": false, "userName": null,
"userColor": false, "userColor": null,
"rtl": false, "rtl": false,
"alwaysShowChat": false, "alwaysShowChat": false,
"chatAndUsers": false, "chatAndUsers": false,

4
src/node/utils/Settings.js
View File

@ -165,8 +165,8 @@ exports.padOptions = {
showChat: true, showChat: true,
showLineNumbers: true, showLineNumbers: true,
useMonospaceFont: false, useMonospaceFont: false,
userName: false, userName: null,
userColor: false, userColor: null,
rtl: false, rtl: false,
alwaysShowChat: false, alwaysShowChat: false,
chatAndUsers: false, chatAndUsers: false,