diff options
| author | Ilja <ilja@ilja.space> | 2022-03-26 12:07:57 +0100 |
|---|---|---|
| committer | Ilja <ilja@ilja.space> | 2022-03-26 12:07:57 +0100 |
| commit | c34fdd46daedf94b8c777e541623f166dabde798 (patch) | |
| tree | f3f766970638cbffdbeac29b4b8a39d66f3b34bc /src/modules/config.js | |
| parent | 2dd75ca76cd36846e76d74fc2f4d5dcedfcc66d7 (diff) | |
| parent | fd77c583bf18be81b628d92b1f95cc14a2d9c09d (diff) | |
Merge remote-tracking branch 'pleroma/develop' into improve_delete_user_confirmation_message
Diffstat (limited to 'src/modules/config.js')
| -rw-r--r-- | src/modules/config.js | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/modules/config.js b/src/modules/config.js index 20979174..ef140bcb 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -12,10 +12,13 @@ const browserLocale = (window.navigator.language || 'en').split('-')[0] export const multiChoiceProperties = [ 'postContentType', 'subjectLineBehavior', + 'conversationDisplay', // tree | linear + 'conversationOtherRepliesButton', // below | inside 'mentionLinkDisplay' // short | full_for_remote | full ] export const defaultState = { + expertLevel: 0, // used to track which settings to show and hide colors: {}, theme: undefined, customTheme: undefined, @@ -27,6 +30,7 @@ export const defaultState = { hideMutedPosts: undefined, // instance default hideMutedThreads: undefined, // instance default hideWordFilteredPosts: undefined, // instance default + muteBotStatuses: undefined, // instance default collapseMessageWithSubject: undefined, // instance default padEmoji: true, hideAttachments: false, @@ -41,7 +45,7 @@ export const defaultState = { alwaysShowNewPostButton: false, autohideFloatingPostButton: false, pauseOnUnfocused: true, - stopGifs: false, + stopGifs: true, replyVisibility: 'all', notificationVisibility: { follows: true, @@ -69,7 +73,7 @@ export const defaultState = { hideFilteredStatuses: undefined, // instance default playVideosInModal: false, useOneClickNsfw: false, - useContainFit: false, + useContainFit: true, greentext: undefined, // instance default useAtIcon: undefined, // instance default mentionLinkDisplay: undefined, // instance default @@ -79,9 +83,15 @@ export const defaultState = { mentionLinkShowYous: undefined, // instance default mentionLinkBoldenYou: undefined, // instance default hidePostStats: undefined, // instance default + hideBotIndication: undefined, // instance default hideUserStats: undefined, // instance default virtualScrolling: undefined, // instance default - sensitiveByDefault: undefined // instance default + sensitiveByDefault: undefined, // instance default + conversationDisplay: undefined, // instance default + conversationTreeAdvanced: undefined, // instance default + conversationOtherRepliesButton: undefined, // instance default + conversationTreeFadeAncestors: undefined, // instance default + maxDepthInThread: undefined // instance default } // caching the instance default properties |