hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix interactions between CW and sensitive flag when spoilersAlwaysOn is set

signup-info-prompt
Thibaut Girka 2018-09-04 18:25:28 +02:00 committed by ThibG
parent 3d5a789bbb
commit c0275cdcb2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/flavours/glitch/features/composer/index.js
View File

@ -485,8 +485,8 @@ class Composer extends React.Component {
onUpload={onUpload} onUpload={onUpload}
privacy={privacy} privacy={privacy}
resetFileKey={resetFileKey} resetFileKey={resetFileKey}
sensitive={sensitive} sensitive={sensitive || (spoilersAlwaysOn && spoilerText && spoilerText.length > 0)}
spoiler={spoiler} spoiler={spoilersAlwaysOn ? (spoilerText && spoilerText.length > 0) : spoiler}
/> />
<ComposerPublisher <ComposerPublisher
countText={`${spoilerText}${countableText(text)}${advancedOptions && advancedOptions.get('do_not_federate') ? ' 👁️' : ''}`} countText={`${spoilerText}${countableText(text)}${advancedOptions && advancedOptions.get('do_not_federate') ? ' 👁️' : ''}`}