Added better progress event logic:

- Works for data: URLs
- Works in IE11
This commit is contained in:
Thomas Byrne
2017-10-20 12:26:33 +11:00
committed by Joshua Granick
parent 05d5238c5b
commit ba45320d7b

View File

@@ -2,12 +2,14 @@ package lime._backend.html5;
import js.html.AnchorElement;
import js.html.ErrorEvent;
import js.html.Event;
import js.html.Image in JSImage;
import js.html.ProgressEvent;
import js.html.XMLHttpRequest;
import js.Browser;
import haxe.io.Bytes;
import js.html.XMLHttpRequestResponseType;
import lime.app.Future;
import lime.app.Promise;
import lime.graphics.Image;
@@ -17,7 +19,7 @@ import lime.net.HTTPRequestHeader;
import lime.utils.AssetType;
@:access(lime.graphics.ImageBuffer)
@:access(lime.graphics.Image)
class HTML5HTTPRequest {
@@ -423,13 +425,7 @@ class HTML5HTTPRequest {
private static function __loadImage (uri:String, promise:Promise<Image>):Void {
var image = new JSImage ();
if (!__isSameOrigin (uri)) {
image.crossOrigin = "Anonymous";
}
if(uri.indexOf("data:") == 0){
image.addEventListener ("load", function (event) {
var buffer = new ImageBuffer (null, image.width, image.height);
@@ -458,7 +454,47 @@ class HTML5HTTPRequest {
}, false);
image.src = uri;
}else{
if (!__isSameOrigin (uri)) {
image.crossOrigin = "Anonymous";
}
var request = new XMLHttpRequest();
request.onload = function (_) {
activeRequests--;
processQueue ();
var img = new Image();
img.__fromBytes( Bytes.ofData(request.response), function(img){
promise.complete (img);
});
}
request.onerror = function (e:ErrorEvent) {
promise.error(e.message);
}
request.onprogress = function(e:ProgressEvent) {
if (e.lengthComputable) {
promise.progress(e.loaded, e.total);
}
}
request.open("GET", uri, true);
request.responseType = XMLHttpRequestResponseType.ARRAYBUFFER;
request.overrideMimeType('text/plain; charset=x-user-defined');
request.send(null);
}
}