Skip to content

Commit

Permalink
pad: Use null as default for userName, userColor options
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
rhansen committed Dec 5, 2021
1 parent 61b608e commit 8c857a8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions doc/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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_LINE_NUMBERS` | | `true` |
| `PAD_OPTIONS_USE_MONOSPACE_FONT` | | `false` |
| `PAD_OPTIONS_USER_NAME` | | `false` |
| `PAD_OPTIONS_USER_COLOR` | | `false` |
| `PAD_OPTIONS_USER_NAME` | | `null` |
| `PAD_OPTIONS_USER_COLOR` | | `null` |
| `PAD_OPTIONS_RTL` | | `false` |
| `PAD_OPTIONS_ALWAYS_SHOW_CHAT` | | `false` |
| `PAD_OPTIONS_CHAT_AND_USERS` | | `false` |
Expand Down
4 changes: 2 additions & 2 deletions settings.json.docker
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@
"showChat": "${PAD_OPTIONS_SHOW_CHAT:true}",
"showLineNumbers": "${PAD_OPTIONS_SHOW_LINE_NUMBERS:true}",
"useMonospaceFont": "${PAD_OPTIONS_USE_MONOSPACE_FONT:false}",
"userName": "${PAD_OPTIONS_USER_NAME:false}",
"userColor": "${PAD_OPTIONS_USER_COLOR:false}",
"userName": "${PAD_OPTIONS_USER_NAME:null}",
"userColor": "${PAD_OPTIONS_USER_COLOR:null}",
"rtl": "${PAD_OPTIONS_RTL:false}",
"alwaysShowChat": "${PAD_OPTIONS_ALWAYS_SHOW_CHAT:false}",
"chatAndUsers": "${PAD_OPTIONS_CHAT_AND_USERS:false}",
Expand Down
4 changes: 2 additions & 2 deletions settings.json.template
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@
"showChat": true,
"showLineNumbers": true,
"useMonospaceFont": false,
"userName": false,
"userColor": false,
"userName": null,
"userColor": null,
"rtl": false,
"alwaysShowChat": false,
"chatAndUsers": false,
Expand Down
4 changes: 2 additions & 2 deletions src/node/utils/Settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ exports.padOptions = {
showChat: true,
showLineNumbers: true,
useMonospaceFont: false,
userName: false,
userColor: false,
userName: null,
userColor: null,
rtl: false,
alwaysShowChat: false,
chatAndUsers: false,
Expand Down

0 comments on commit 8c857a8

Please sign in to comment.