|
@@ -201,19 +201,29 @@ procedure TURLLoader.dofetch(resolve,reject : TJSPromiseResolver);
|
|
);
|
|
);
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
+ function doErr(Err : JSValue) : JSValue;
|
|
|
|
+
|
|
|
|
+ Var
|
|
|
|
+ F : TFailData;
|
|
|
|
+ begin
|
|
|
|
+ F.message:='Unknown error: '+TJSJSON.Stringify(Err);
|
|
|
|
+ F.code:=999;
|
|
|
|
+ Result:=Reject(F);
|
|
|
|
+ end;
|
|
|
|
+
|
|
function doFail(respo : JSValue) : JSValue;
|
|
function doFail(respo : JSValue) : JSValue;
|
|
|
|
|
|
Var
|
|
Var
|
|
F : TFailData;
|
|
F : TFailData;
|
|
|
|
|
|
begin
|
|
begin
|
|
- F.message:='unknown error';
|
|
|
|
|
|
+ F.message:='Unknown error';
|
|
F.code:=999;
|
|
F.code:=999;
|
|
Result:=Reject(F);
|
|
Result:=Reject(F);
|
|
end;
|
|
end;
|
|
|
|
|
|
begin
|
|
begin
|
|
- Window.Fetch(URl)._then(@DoOK).catch(@DoFail);
|
|
|
|
|
|
+ Window.Fetch(URl)._then(@DoOK,@DoErr).catch(@DoFail);
|
|
end;
|
|
end;
|
|
|
|
|
|
function TURLLoader.fetch : TJSPromise;
|
|
function TURLLoader.fetch : TJSPromise;
|
|
@@ -282,7 +292,7 @@ Var
|
|
Idx : Integer;
|
|
Idx : Integer;
|
|
|
|
|
|
begin
|
|
begin
|
|
- FTemplates[aName]:=aTemplate;
|
|
|
|
|
|
+ FTemplates[LowerCase(aName)]:=aTemplate;
|
|
if Assigned(FOnLoad) then
|
|
if Assigned(FOnLoad) then
|
|
FOnLoad(Self,aName);
|
|
FOnLoad(Self,aName);
|
|
Idx:=IndexOfTemplateEvent(aName);
|
|
Idx:=IndexOfTemplateEvent(aName);
|