rsesot/misskey
1
0
Fork 0
forked from mirrors/misskey
Code Pull Requests Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
syuilo
2019-04-29 11:11:17 +09:00
parent 9406079cb7 a58df29208
commit 8836bd4f3b
5 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/app/common/views/pages/page/page.vue
View File

@@ -38,8 +38,10 @@ class Script {
}
public interpolate(str: string) {
return str.replace(/\{(.+?)\}/g, match =>
(this.vars.find(x => x.name === match.slice(1, -1).trim()).value || '').toString());
return str.replace(/\{(.+?)\}/g, match => {
const v = this.vars.find(x => x.name === match.slice(1, -1).trim()).value;
return v == null ? 'NULL' : v.toString();
});
}
}