summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-02-22 19:39:58 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-02-22 19:39:58 +0900
commit0c6b95889ee7bdee3fb14bb81a3f86f17204742d (patch)
tree97d095f43b01ffa9bf798046bcd6caa51ce9b18d /src
parentFix bug (diff)
parentUpdate uploader.tag (diff)
downloadsharkey-0c6b95889ee7bdee3fb14bb81a3f86f17204742d.tar.gz
sharkey-0c6b95889ee7bdee3fb14bb81a3f86f17204742d.tar.bz2
sharkey-0c6b95889ee7bdee3fb14bb81a3f86f17204742d.zip
Merge branch 'master' of https://github.com/syuilo/misskey
Diffstat (limited to 'src')
-rw-r--r--src/web/app/common/tags/uploader.tag2
-rw-r--r--src/web/app/mobile/tags/post-form.tag2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/web/app/common/tags/uploader.tag b/src/web/app/common/tags/uploader.tag
index 51520d9abd..d40ac0a6a0 100644
--- a/src/web/app/common/tags/uploader.tag
+++ b/src/web/app/common/tags/uploader.tag
@@ -171,7 +171,7 @@
if (folder) data.append('folder_id', folder);
const xhr = new XMLHttpRequest();
- xhr.open('POST', CONFIG.apiUrl + '/drive/files/create', true);
+ xhr.open('POST', this.CONFIG.apiUrl + '/drive/files/create', true);
xhr.onload = e => {
const driveFile = JSON.parse(e.target.response);
diff --git a/src/web/app/mobile/tags/post-form.tag b/src/web/app/mobile/tags/post-form.tag
index 353db01540..a3208efe37 100644
--- a/src/web/app/mobile/tags/post-form.tag
+++ b/src/web/app/mobile/tags/post-form.tag
@@ -268,7 +268,7 @@
this.api('posts/create', {
text: this.refs.text.value,
media_ids: files,
- reply_to_id: this.inReplyToPost ? this.inReplyToPost.id : undefined,
+ reply_to_id: opts.reply ? opts.reply.id : undefined,
poll: this.poll ? this.refs.poll.get() : undefined
}).then(data => {
this.trigger('post');