Merge branch 'develop'

This commit is contained in:
syuilo
2019-04-24 20:51:34 +09:00
4 changed files with 9 additions and 4 deletions

View File

@ -38,10 +38,10 @@ export default Vue.extend({
const data = new FormData();
data.append('md5', getMD5(fileData));
this.$root.api('drive/files/check_existence', {
this.$root.api('drive/files/find-by-hash', {
md5: getMD5(fileData)
}).then(resp => {
resolve(resp.file);
resolve(resp.length > 0 ? resp[0] : null);
});
});
},

View File

@ -228,7 +228,7 @@ export default Vue.extend({
const draft = JSON.parse(localStorage.getItem('drafts') || '{}')[this.draftId];
if (draft) {
this.text = draft.data.text;
this.files = draft.data.files;
this.files = (draft.data.files || []).filter(e => e);
if (draft.data.poll) {
this.poll = true;
this.$nextTick(() => {