about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/composer
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-02-13 16:19:15 +0100
committerGitHub <noreply@github.com>2019-02-13 16:19:15 +0100
commit435a367c108047170dc752ef766a4264dd90b5c8 (patch)
tree95de2a7f37a8c2345175550fbce54f207b4aec7d /app/javascript/flavours/glitch/features/composer
parenta3ba28eb17d75af37396359e8c37675e06605ccf (diff)
parent614ea184bb911a5b86804e05350997bafc605580 (diff)
Merge pull request #914 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/composer')
-rw-r--r--app/javascript/flavours/glitch/features/composer/spoiler/index.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/composer/spoiler/index.js b/app/javascript/flavours/glitch/features/composer/spoiler/index.js
index 1c3c962f0..e2f9c7021 100644
--- a/app/javascript/flavours/glitch/features/composer/spoiler/index.js
+++ b/app/javascript/flavours/glitch/features/composer/spoiler/index.js
@@ -87,6 +87,7 @@ export default class ComposerSpoiler extends React.PureComponent {
             type='text'
             value={text}
             ref={handleRefSpoilerText}
+            disabled={hidden}
           />
         </label>
       </div>