matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Weblate
2017-10-19 16:28:54 +00:00
parent 40c301c400 bd982cf0ae
commit 1bf295f733
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ContentMessages.js
View File

@@ -99,23 +99,17 @@ function loadImageElement(imageFile) {
// Load the file into an html element // Load the file into an html element
const img = document.createElement("img"); const img = document.createElement("img");
const objectUrl = URL.createObjectURL(imageFile);
img.src = objectUrl;
const reader = new FileReader(); // Once ready, create a thumbnail
reader.onload = function(e) { img.onload = function() {
img.src = e.target.result; URL.revokeObjectURL(objectUrl);
deferred.resolve(img);
// Once ready, create a thumbnail
img.onload = function() {
deferred.resolve(img);
};
img.onerror = function(e) {
deferred.reject(e);
};
}; };
reader.onerror = function(e) { img.onerror = function(e) {
deferred.reject(e); deferred.reject(e);
}; };
reader.readAsDataURL(imageFile);
return deferred.promise; return deferred.promise;
} }