summaryrefslogtreecommitdiff
path: root/src/client/app/common/scripts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-07-19 03:38:05 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-07-19 03:38:05 +0900
commitcd5b24d4eb494a4e9279348639e30b28bcdaa9f9 (patch)
treeabc65a9511b5affbcfd2ff063c8eda2c6251c637 /src/client/app/common/scripts
parentMerge branch 'develop' (diff)
parent11.26.0 (diff)
downloadsharkey-cd5b24d4eb494a4e9279348639e30b28bcdaa9f9.tar.gz
sharkey-cd5b24d4eb494a4e9279348639e30b28bcdaa9f9.tar.bz2
sharkey-cd5b24d4eb494a4e9279348639e30b28bcdaa9f9.zip
Merge branch 'develop'
Diffstat (limited to 'src/client/app/common/scripts')
-rw-r--r--src/client/app/common/scripts/collect-page-vars.ts6
-rw-r--r--src/client/app/common/scripts/get-face.ts3
2 files changed, 8 insertions, 1 deletions
diff --git a/src/client/app/common/scripts/collect-page-vars.ts b/src/client/app/common/scripts/collect-page-vars.ts
index 4c40d5d88e..a4096fb2c2 100644
--- a/src/client/app/common/scripts/collect-page-vars.ts
+++ b/src/client/app/common/scripts/collect-page-vars.ts
@@ -32,6 +32,12 @@ export function collectPageVars(content) {
type: 'number',
value: 0
});
+ } else if (x.type === 'radioButton') {
+ pageVars.push({
+ name: x.name,
+ type: 'string',
+ value: x.default || ''
+ });
} else if (x.children) {
collect(x.children);
}
diff --git a/src/client/app/common/scripts/get-face.ts b/src/client/app/common/scripts/get-face.ts
index b523948bd3..19f2bdb064 100644
--- a/src/client/app/common/scripts/get-face.ts
+++ b/src/client/app/common/scripts/get-face.ts
@@ -4,7 +4,8 @@ const faces = [
'🐡( \'-\' 🐡 )フグパンチ!!!!',
'✌️(´・_・`)✌️',
'(。>﹏<。)',
- '(Δ・x・Δ)'
+ '(Δ・x・Δ)',
+ '(コ`・ヘ・´ケ)'
];
export default () => faces[Math.floor(Math.random() * faces.length)];