Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source
This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/server/web/app/common/views/components/messaging-room.form.vue
View file

@ -151,9 +151,9 @@ export default Vue.extend({
send() {
this.sending = true;
(this as any).api('messaging/messages/create', {
user_id: this.user.id,
userId: this.user.id,
text: this.text ? this.text : undefined,
file_id: this.file ? this.file.id : undefined
fileId: this.file ? this.file.id : undefined
}).then(message => {
this.clear();
}).catch(err => {
@ -173,7 +173,7 @@ export default Vue.extend({
const data = JSON.parse(localStorage.getItem('message_drafts') || '{}');
data[this.draftId] = {
updated_at: new Date(),
updatedAt: new Date(),
data: {
text: this.text,
file: this.file