summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-04-22 10:44:17 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-04-22 10:44:17 +0900
commit20e77196f28178c869402985761bd4c2fa74bf0a (patch)
treebeb333d0a01cf6752bdcc6028c82ce63f579f1f1 /src/client
parentFix #1531 (diff)
downloadsharkey-20e77196f28178c869402985761bd4c2fa74bf0a.tar.gz
sharkey-20e77196f28178c869402985761bd4c2fa74bf0a.tar.bz2
sharkey-20e77196f28178c869402985761bd4c2fa74bf0a.zip
AP: 投票をレンダリング
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/desktop/views/components/notes.note.vue2
-rw-r--r--src/client/docs/api/entities/note.yaml6
-rw-r--r--src/client/docs/api/entities/post.yaml6
3 files changed, 1 insertions, 13 deletions
diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue
index 1352fc4ee7..ae2793db92 100644
--- a/src/client/app/desktop/views/components/notes.note.vue
+++ b/src/client/app/desktop/views/components/notes.note.vue
@@ -36,7 +36,7 @@
</p>
<div class="text">
<a class="reply" v-if="p.reply">%fa:reply%</a>
- <mk-note-html v-if="p.textHtml" :text="p.text" :i="os.i" :class="$style.text"/>
+ <mk-note-html v-if="p.text" :text="p.text" :i="os.i" :class="$style.text"/>
<a class="rp" v-if="p.renote">RP:</a>
</div>
<div class="media" v-if="p.media.length > 0">
diff --git a/src/client/docs/api/entities/note.yaml b/src/client/docs/api/entities/note.yaml
index 718d331d13..6fd26543bb 100644
--- a/src/client/docs/api/entities/note.yaml
+++ b/src/client/docs/api/entities/note.yaml
@@ -29,12 +29,6 @@ props:
desc:
ja: "投稿の本文 (ローカルの場合Markdown風のフォーマット)"
en: "The text of this note (in Markdown like format if local)"
- - name: "textHtml"
- type: "string"
- optional: true
- desc:
- ja: "投稿の本文 (HTML) (投稿時は無視)"
- en: "The text of this note (in HTML. Ignored when posting.)"
- name: "mediaIds"
type: "id(DriveFile)[]"
optional: true
diff --git a/src/client/docs/api/entities/post.yaml b/src/client/docs/api/entities/post.yaml
index 718d331d13..6fd26543bb 100644
--- a/src/client/docs/api/entities/post.yaml
+++ b/src/client/docs/api/entities/post.yaml
@@ -29,12 +29,6 @@ props:
desc:
ja: "投稿の本文 (ローカルの場合Markdown風のフォーマット)"
en: "The text of this note (in Markdown like format if local)"
- - name: "textHtml"
- type: "string"
- optional: true
- desc:
- ja: "投稿の本文 (HTML) (投稿時は無視)"
- en: "The text of this note (in HTML. Ignored when posting.)"
- name: "mediaIds"
type: "id(DriveFile)[]"
optional: true