OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1508 from matrix-org/dbkr/image_objecturl 

Use object URLs to load Files in to images
pull/21833/head
Luke Barnard 2017-10-19 17:28:49 +01:00 committed by GitHub
parent 0f4ca1992d b74ad8634b
commit bd982cf0ae
1 changed files with 7 additions and 13 deletions
Show Stats 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;
} }