summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-11-15 01:52:08 +0000
committerMatthew Hodgson <matthew@matrix.org>2014-11-15 01:52:08 +0000
commit8413c382957444e900cc2d8166465867bed4e0d0 (patch)
tree5e4be11f9630796ee382f07d1b72dffc0755915b
parentmerge in msg.__room_member usage to new message display template (diff)
downloadsynapse-8413c382957444e900cc2d8166465867bed4e0d0.tar.xz
doc
-rw-r--r--syweb/webclient/components/fileUpload/file-upload-service.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/syweb/webclient/components/fileUpload/file-upload-service.js b/syweb/webclient/components/fileUpload/file-upload-service.js

index 28e3f0ff5e..9a67096c5f 100644 --- a/syweb/webclient/components/fileUpload/file-upload-service.js +++ b/syweb/webclient/components/fileUpload/file-upload-service.js
@@ -47,11 +47,11 @@ angular.module('mFileUpload', ['matrixService', 'mUtilities']) }; /* - * Upload an filmessagee plus generate a thumbnail of it (if possible) and upload it so that - * we will have all information to fulfill an image message request data. + * Upload an file plus generate a thumbnail of it (if possible) and upload it so that + * we will have all information to fulfill an file/image message request * @param {File} file the file to send * @param {Integer} thumbnailSize the max side size of the thumbnail to create - * @returns {promise} A promise that will be resolved by a image message object + * @returns {promise} A promise that will be resolved by a message object * ready to be send with the Matrix API */ this.uploadFileAndThumbnail = function(file, thumbnailSize) {