mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-27 03:58:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

Safari needs the img.onload event before actually working on the img

Browse source
This commit is contained in:
Emmanuel ROHEE 2014-08-22 10:15:15 +02:00
parent be2f948da5
commit c8d0c4762d
2 changed files with 39 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
webclient/components/fileUpload/file-upload-service.js
View file

@ -82,6 +82,7 @@ angular.module('mFileUpload', ['matrixService', 'mUtilities'])
// First, get the image size // First, get the image size
mUtilities.getImageSize(imageFile).then( mUtilities.getImageSize(imageFile).then(
function(size) { function(size) {
console.log("image size: " + JSON.stringify(size));
// The final operation: send imageFile // The final operation: send imageFile
var uploadImage = function() { var uploadImage = function() {

11
webclient/components/utilities/utilities-service.js
View file

@ -38,11 +38,16 @@ angular.module('mUtilities', [])
img.src = e.target.result; img.src = e.target.result;
// Once ready, returns its size // Once ready, returns its size
img.onload = function() {
deferred.resolve({ deferred.resolve({
width: img.width, width: img.width,
height: img.height height: img.height
}); });
}; };
img.onerror = function(e) {
deferred.reject(e);
};
};
reader.onerror = function(e) { reader.onerror = function(e) {
deferred.reject(e); deferred.reject(e);
}; };
@ -72,6 +77,8 @@ angular.module('mUtilities', [])
img.src = e.target.result; img.src = e.target.result;
// Once ready, returns its size
img.onload = function() {
var ctx = canvas.getContext("2d"); var ctx = canvas.getContext("2d");
ctx.drawImage(img, 0, 0); ctx.drawImage(img, 0, 0);
@ -99,6 +106,10 @@ angular.module('mUtilities', [])
var dataUrl = canvas.toDataURL("image/jpeg", 0.7); var dataUrl = canvas.toDataURL("image/jpeg", 0.7);
deferred.resolve(self.dataURItoBlob(dataUrl)); deferred.resolve(self.dataURItoBlob(dataUrl));
}; };
img.onerror = function(e) {
deferred.reject(e);
};
};
reader.onerror = function(e) { reader.onerror = function(e) {
deferred.reject(e); deferred.reject(e);
}; };