diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-08-18 04:20:57 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-18 04:20:57 +0900 |
| commit | 8973b76bda600cc5a9fb5660d7edc7c17e808b82 (patch) | |
| tree | c120414bff9b9e553537f9aa4f4c3171be3fccb7 /src | |
| parent | Merge pull request #2300 from syuilo/delete-autogen (diff) | |
| parent | Fix #2301 (diff) | |
| download | misskey-8973b76bda600cc5a9fb5660d7edc7c17e808b82.tar.gz misskey-8973b76bda600cc5a9fb5660d7edc7c17e808b82.tar.bz2 misskey-8973b76bda600cc5a9fb5660d7edc7c17e808b82.zip | |
Merge pull request #2302 from syuilo/kao-to-faces
Fix #2301
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/common/scripts/get-face.ts (renamed from src/client/app/common/scripts/get-kao.ts) | 4 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/post-form.vue | 4 | ||||
| -rw-r--r-- | src/client/app/mobile/views/components/post-form.vue | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/client/app/common/scripts/get-kao.ts b/src/client/app/common/scripts/get-face.ts index 2c9280c9b6..79cf7a1be4 100644 --- a/src/client/app/common/scripts/get-kao.ts +++ b/src/client/app/common/scripts/get-face.ts @@ -1,4 +1,4 @@ -const kaos = [ +const faces = [ '(=^・・^=)', 'v(\'ω\')v', '🐡( \'-\' 🐡 )フグパンチ!!!!', @@ -7,4 +7,4 @@ const kaos = [ '(Δ・x・Δ)' ]; -export default () => kaos[Math.floor(Math.random() * kaos.length)]; +export default () => faces[Math.floor(Math.random() * faces.length)]; diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue index d5d160bd8f..bacaea65ee 100644 --- a/src/client/app/desktop/views/components/post-form.vue +++ b/src/client/app/desktop/views/components/post-form.vue @@ -58,7 +58,7 @@ import Vue from 'vue'; import insertTextAtCursor from 'insert-text-at-cursor'; import * as XDraggable from 'vuedraggable'; -import getKao from '../../../common/scripts/get-kao'; +import getFace from '../../../common/scripts/get-face'; import MkVisibilityChooser from '../../../common/views/components/visibility-chooser.vue'; import parse from '../../../../../mfm/parse'; import { host } from '../../../config'; @@ -421,7 +421,7 @@ export default Vue.extend({ }, kao() { - this.text += getKao(); + this.text += getFace(); } } }); diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue index 466ca393d5..a74df67c0a 100644 --- a/src/client/app/mobile/views/components/post-form.vue +++ b/src/client/app/mobile/views/components/post-form.vue @@ -56,7 +56,7 @@ import Vue from 'vue'; import insertTextAtCursor from 'insert-text-at-cursor'; import * as XDraggable from 'vuedraggable'; import MkVisibilityChooser from '../../../common/views/components/visibility-chooser.vue'; -import getKao from '../../../common/scripts/get-kao'; +import getFace from '../../../common/scripts/get-face'; import parse from '../../../../../mfm/parse'; import { host } from '../../../config'; @@ -313,7 +313,7 @@ export default Vue.extend({ }, kao() { - this.text += getKao(); + this.text += getFace(); } } }); |