diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-24 02:17:04 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-24 02:17:04 +0900 |
| commit | fd2ae6d3cf7d671696120fca5b48200aed83f0c4 (patch) | |
| tree | 223a4678c7ad513e659368de8d555e387225e2bd | |
| parent | Fix error (diff) | |
| parent | Fix: some post form errors (#5212) (diff) | |
| download | sharkey-fd2ae6d3cf7d671696120fca5b48200aed83f0c4.tar.gz sharkey-fd2ae6d3cf7d671696120fca5b48200aed83f0c4.tar.bz2 sharkey-fd2ae6d3cf7d671696120fca5b48200aed83f0c4.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
| -rw-r--r-- | src/client/app/common/views/components/post-form-attaches.vue | 2 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/post-form-window.vue | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/client/app/common/views/components/post-form-attaches.vue b/src/client/app/common/views/components/post-form-attaches.vue index 37422ba108..e051b6a808 100644 --- a/src/client/app/common/views/components/post-form-attaches.vue +++ b/src/client/app/common/views/components/post-form-attaches.vue @@ -36,7 +36,7 @@ export default Vue.extend({ required: true }, detachMediaFn: { - type: Object, + type: Function, required: false } }, diff --git a/src/client/app/desktop/views/components/post-form-window.vue b/src/client/app/desktop/views/components/post-form-window.vue index 8dd7c584a2..78e69049a1 100644 --- a/src/client/app/desktop/views/components/post-form-window.vue +++ b/src/client/app/desktop/views/components/post-form-window.vue @@ -5,8 +5,8 @@ <span class="icon" v-if="geo"><fa icon="map-marker-alt"/></span> <span v-if="!reply">{{ $t('note') }}</span> <span v-if="reply">{{ $t('reply') }}</span> - <span class="count" v-if="files.length != 0">{{ this.$t('attaches').replace('{}', files.length) }}</span> - <span class="count" v-if="uploadings.length != 0">{{ this.$t('uploading-media').replace('{}', uploadings.length) }}<mk-ellipsis/></span> + <span class="count" v-if="files.length != 0">{{ $t('attaches').replace('{}', files.length) }}</span> + <span class="count" v-if="uploadings.length != 0">{{ $t('uploading-media').replace('{}', uploadings.length) }}<mk-ellipsis/></span> </span> </template> |