Merge branch 'next' into devel
This commit is contained in:
@@ -891,7 +891,12 @@ class MessagesView extends React.Component {
|
|||||||
} else {
|
} else {
|
||||||
// Small enough to send inband.
|
// Small enough to send inband.
|
||||||
fileToBase64(file)
|
fileToBase64(file)
|
||||||
.then(b64 => this.sendMessage(Drafty.attachFile(null, {mime: b64.mime, data: b64.bits, filename: b64.name})))
|
.then(b64 => this.sendMessage(Drafty.attachFile(null, {
|
||||||
|
mime: b64.mime,
|
||||||
|
data: b64.bits,
|
||||||
|
filename: b64.name,
|
||||||
|
size: file.size
|
||||||
|
})))
|
||||||
.catch(err => this.props.onError(err.message, 'err'));
|
.catch(err => this.props.onError(err.message, 'err'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -6245,7 +6245,8 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
|
|||||||
(0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.fileToBase64)(file).then(b64 => this.sendMessage(tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.attachFile(null, {
|
(0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.fileToBase64)(file).then(b64 => this.sendMessage(tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.attachFile(null, {
|
||||||
mime: b64.mime,
|
mime: b64.mime,
|
||||||
data: b64.bits,
|
data: b64.bits,
|
||||||
filename: b64.name
|
filename: b64.name,
|
||||||
|
size: file.size
|
||||||
}))).catch(err => this.props.onError(err.message, 'err'));
|
}))).catch(err => this.props.onError(err.message, 'err'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user