diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-04-29 11:11:17 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-04-29 11:11:17 +0900 |
| commit | 8836bd4f3b7974f21b3c19b20a77bef5f733ff6e (patch) | |
| tree | c17e2f7801087f1c430bde21ecc3eb0b9e5d4cf3 | |
| parent | Merge branch 'develop' (diff) | |
| parent | 11.5.1 (diff) | |
| download | misskey-8836bd4f3b7974f21b3c19b20a77bef5f733ff6e.tar.gz misskey-8836bd4f3b7974f21b3c19b20a77bef5f733ff6e.tar.bz2 misskey-8836bd4f3b7974f21b3c19b20a77bef5f733ff6e.zip | |
Merge branch 'develop'
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/client/app/common/scripts/aiscript.ts | 8 | ||||
| -rw-r--r-- | src/client/app/common/views/pages/page/page.vue | 6 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/ui.header.account.vue | 2 |
5 files changed, 17 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a2ed4e4437..71d4c0dbec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,12 @@ mongodb: 8. master ブランチに戻す 9. enjoy +11.5.1 (2019/04/29) +------------------- +### Fixes +* MisskeyPagesで環境変数を別の変数内で使えない問題を修正 +* MisskeyPagesで値が0の変数が表示されない問題を修正 + 11.5.0 (2019/04/29) ------------------- ### 注意 diff --git a/package.json b/package.json index 14d3bcc8ff..4299089f5c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo <i@syuilo.com>", - "version": "11.5.0", + "version": "11.5.1", "codename": "daybreak", "repository": { "type": "git", diff --git a/src/client/app/common/scripts/aiscript.ts b/src/client/app/common/scripts/aiscript.ts index 4ef21f9943..a3e499fc88 100644 --- a/src/client/app/common/scripts/aiscript.ts +++ b/src/client/app/common/scripts/aiscript.ts @@ -316,8 +316,10 @@ export class AiScript { @autobind private interpolate(str: string, values: { name: string, value: any }[]) { - return str.replace(/\{(.+?)\}/g, match => - (this.getVariableValue(match.slice(1, -1).trim(), values) || '').toString()); + return str.replace(/\{(.+?)\}/g, match => { + const v = this.getVariableValue(match.slice(1, -1).trim(), values); + return v == null ? 'NULL' : v.toString(); + }); } @autobind @@ -445,7 +447,7 @@ export class AiScript { } if (AiScript.envVarsDef[name]) { - return this.envVars[name].value; + return this.envVars[name]; } throw new Error(`Script: No such variable '${name}'`); diff --git a/src/client/app/common/views/pages/page/page.vue b/src/client/app/common/views/pages/page/page.vue index 5ca58a6a4e..e7e8f76d53 100644 --- a/src/client/app/common/views/pages/page/page.vue +++ b/src/client/app/common/views/pages/page/page.vue @@ -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(); + }); } } diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue index 05692667b7..9b87e0c29f 100644 --- a/src/client/app/desktop/views/components/ui.header.account.vue +++ b/src/client/app/desktop/views/components/ui.header.account.vue @@ -35,7 +35,7 @@ <i><fa icon="angle-right"/></i> </p> </li> - <li @click="page"> + <li> <router-link to="/i/pages"> <i><fa :icon="faStickyNote" fixed-width/></i> <span>{{ $t('@.pages') }}</span> |