paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-04-08 22:07:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

rtl: SetMethodProp: reuse callback if possible

Browse Source
This commit is contained in:
mattias 2019-10-21 16:36:27 +00:00
parent d7d47e1439
commit b1c084790f
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/rtl/typinfo.pas
View File

@ -1418,7 +1418,19 @@ procedure SetMethodProp(Instance: TObject; PropInfo: TTypeMemberProperty;
var
cb: TJSFunction;
begin
cb:=createCallback(Value.Data,Value.Code);
// Note: Value.Data=nil is allowed and can be used by designer code
if Value.Code=nil then
cb:=nil
else if isFunction(Value.Code)
and (TJSObject(Value.Code)['scope']=Value.Data)
and (isFunction(TJSObject(Value.Code)['fn']) or isString(TJSObject(Value.Code)['fn']))
then
begin
// Value.Code is already a callback
cb:=TJSFunction(Value.Code);
end
else
cb:=createCallback(Value.Data,Value.Code);
SetJSValueProp(Instance,PropInfo,cb);
end;