aboutsummaryrefslogtreecommitdiff
path: root/src/components/status_content/status_content.js
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2022-03-30 01:26:35 +0300
committerHenry Jameson <me@hjkos.com>2022-03-30 01:26:35 +0300
commit115170f35dbbd9656f64325e6f4c7b58b8b9c07f (patch)
tree9b63d10ee8ee18e0bb2ed85c988d2c4f151ee413 /src/components/status_content/status_content.js
parent97e072d93a50c45a4a16bbdc6273266b31f4d095 (diff)
parentc3690b456e66585598f05d71643089a5e9770af7 (diff)
Merge branch 'vue3-again' into vue3-no-compat
* vue3-again: fix emoji input warning spam fix error clear icon Add controlledShowingLongSubject and toggle in StatusContent props
Diffstat (limited to 'src/components/status_content/status_content.js')
-rw-r--r--src/components/status_content/status_content.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index e69c3afd..89f0aa51 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -59,7 +59,9 @@ const StatusContent = {
'controlledShowingTall',
'controlledExpandingSubject',
'controlledToggleShowingTall',
- 'controlledToggleExpandingSubject'
+ 'controlledToggleExpandingSubject',
+ 'controlledShowingLongSubject',
+ 'controlledToggleShowingLongSubject'
],
data () {
return {