mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 15:31:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

size > upload_size as per spec feedback

Browse source
This commit is contained in:
Will Hunt 2018-05-03 17:02:37 +01:00
parent 0fad90eb43
commit 7c0811dd92
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/components/views/rooms/MessageComposer.js
View file

@ -65,6 +65,13 @@ export default class MessageComposer extends React.Component {
// XXX: fragile as all hell - fixme somehow, perhaps with a dedicated Room.encryption event or something. // XXX: fragile as all hell - fixme somehow, perhaps with a dedicated Room.encryption event or something.
MatrixClientPeg.get().on("event", this.onEvent); MatrixClientPeg.get().on("event", this.onEvent);
this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate); this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
MatrixClientPeg.get().getMediaLimits().then((limits) => {
this._uploadLimits = limits;
}).catch(() => {
// HS can't or won't provide limits, so don't give any.
this._uploadLimits = {};
})
} }
componentWillUnmount() { componentWillUnmount() {
@ -99,17 +106,12 @@ export default class MessageComposer extends React.Component {
onUploadFileSelected(files) { onUploadFileSelected(files) {
const tfiles = files.target.files; const tfiles = files.target.files;
MatrixClientPeg.get().getMediaLimits().then((limits) => { this.uploadFiles(tfiles);
this.uploadFiles(tfiles, limits);
}).catch(() => {
// HS can't or won't provide limits, so don't give any.
this.uploadFiles(tfiles, {});
});
} }
isFileUploadAllowed(file, limits) { isFileUploadAllowed(file) {
if (limits.size != null && file.size > limits.size) { if (this._uploadLimits.upload_size != null && file.size > this._uploadLimits.upload_size) {
return _t("File is too big. Maximum file size is %(fileSize)s", {fileSize: filesize(limits.size)}); return _t("File is too big. Maximum file size is %(fileSize)s", {fileSize: filesize(this._uploadLimits.upload_size)});
} }
return true; return true;
} }
@ -123,7 +125,7 @@ export default class MessageComposer extends React.Component {
const failedFiles = []; const failedFiles = [];
for (let i=0; i<files.length; i++) { for (let i=0; i<files.length; i++) {
const fileAcceptedOrError = this.isFileUploadAllowed(files[i], limits); const fileAcceptedOrError = this.isFileUploadAllowed(files[i]);
if (fileAcceptedOrError === true) { if (fileAcceptedOrError === true) {
acceptedFiles.push(<li key={i}> acceptedFiles.push(<li key={i}>
<TintableSvg key={i} src="img/files.svg" width="16" height="16" /> { files[i].name || _t('Attachment') } <TintableSvg key={i} src="img/files.svg" width="16" height="16" /> { files[i].name || _t('Attachment') }