aboutsummaryrefslogtreecommitdiff
path: root/src/components/status_content/status_content.js
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2022-03-29 20:00:59 +0300
committerHenry Jameson <me@hjkos.com>2022-03-29 20:00:59 +0300
commit2179054384b8e528cea92a9c39db8cfb0c60e542 (patch)
treeb891d0071819cb9ac8817098ea074962115326a9 /src/components/status_content/status_content.js
parent2d7f242713edc45dbcc2811cd86d8864d093ce3f (diff)
parenta3f48fc3f4230b283d62f55fcdf03247ae2ac481 (diff)
Merge branch 'vue3-again' into vue3-no-compat
* vue3-again: fix warning about custom component fix? fix some issues with trees removing uselsess stuff fix reset buttons in profile again fix spacing in poll expiration label registration fixes
Diffstat (limited to 'src/components/status_content/status_content.js')
-rw-r--r--src/components/status_content/status_content.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index f47d036a..e69c3afd 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -31,7 +31,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => {
const controlledName = `controlled${camelized}`
const uncontrolledName = `uncontrolled${camelized}`
res[name] = function () {
- return (this.$props[toggle] && this[toggle]) ? this[controlledName] : this[uncontrolledName]
+ return ((this.$data[toggle] !== undefined || this.$props[toggle] !== undefined) && this[toggle]) ? this[controlledName] : this[uncontrolledName]
}
return res
}, {})