paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-04-06 03:37:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix event handler signature

Browse Source
This commit is contained in:
michael 2019-08-20 07:25:39 +00:00
parent 1f3db78f37
commit 69ca0ce68a
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/fcldb/demorest.lpr
View File

@ -185,7 +185,7 @@ Var
e : TJSElement; e : TJSElement;
begin begin
e:=aEvent.target; e:=TJSElement(aEvent.target);
While Assigned(e) and Not SameText(e.nodeName,'tr') do While Assigned(e) and Not SameText(e.nodeName,'tr') do
e:=e.parentElement; e:=e.parentElement;
if Not Assigned(E) then exit; if Not Assigned(E) then exit;

2
demo/fpreport/frmmain.pp
View File

@ -118,7 +118,7 @@ Var
begin begin
Result:=true; Result:=true;
tid:=aEvent.CurrentTarget.id; tid:=TJSElement(aEvent.CurrentTarget).id;
ActivateTab(tid); ActivateTab(tid);
If (tid='navpdf') then If (tid='navpdf') then
Activate(PPDFOptions) Activate(PPDFOptions)

17
packages/rtl/web.pas
View File

@ -61,12 +61,15 @@ Type
{ TEventListenerEvent } { TEventListenerEvent }
TEventListenerEvent = class external name 'EventListener_Event' (TJSObject) (*
TEventListenerEvent = class external name 'EventListener_Event' (TJSObject)
private private
FTarget: TJSEventTarget; external name 'target'; FTarget: TJSEventTarget; external name 'target';
public public
Property target: TJSEventTarget Read FTarget; Property target: TJSEventTarget Read FTarget;
end; end;
*)
TEventListenerEvent = TJSEvent;
TJSEventHandler = reference to function(Event: TEventListenerEvent): boolean; TJSEventHandler = reference to function(Event: TEventListenerEvent): boolean;
TJSRawEventHandler = reference to Procedure(Event: TJSEvent); TJSRawEventHandler = reference to Procedure(Event: TJSEvent);
@ -426,10 +429,12 @@ Type
FBubbles : Boolean; external name 'bubbles'; FBubbles : Boolean; external name 'bubbles';
FCancelable : Boolean; external name 'cancelable'; FCancelable : Boolean; external name 'cancelable';
FComposed : Boolean; external name 'composed'; FComposed : Boolean; external name 'composed';
FCurrentTarget : TJSElement; external name 'currentTarget'; FCurrentTarget : TJSEventTarget; external name 'currentTarget';
FCurrentTargetElement : TJSElement; external name 'currentTarget';
FdefaultPrevented : Boolean; external name 'defaultPrevented'; FdefaultPrevented : Boolean; external name 'defaultPrevented';
FEventPhase : NativeInt; external name 'eventPhase'; FEventPhase : NativeInt; external name 'eventPhase';
FTarget : TJSElement; external name 'target'; FTarget : TJSEventTarget; external name 'target';
FTargetElement : TJSElement; external name 'target';
FTimeStamp : NativeInt; external name 'timestamp'; FTimeStamp : NativeInt; external name 'timestamp';
FType : String; external name 'type'; FType : String; external name 'type';
FIsTrusted : Boolean; external name 'isTrusted'; FIsTrusted : Boolean; external name 'isTrusted';
@ -449,10 +454,12 @@ Type
Property bubbles : Boolean Read FBubbles; Property bubbles : Boolean Read FBubbles;
Property cancelable : Boolean Read FCancelable; Property cancelable : Boolean Read FCancelable;
Property composed : Boolean Read FComposed; Property composed : Boolean Read FComposed;
property currentTarget : TJSElement Read FCurrentTarget; property currentTarget : TJSEventTarget Read FCurrentTarget;
property currentTargetElement : TJSElement Read FCurrentTargetElement;
property defaultPrevented : Boolean Read FdefaultPrevented; property defaultPrevented : Boolean Read FdefaultPrevented;
property eventPhase : NativeInt Read FEventPhase; property eventPhase : NativeInt Read FEventPhase;
property target : TJSElement Read FTarget; property target : TJSEventTarget Read FTarget;
property targetElement : TJSElement Read FTargetElement;
Property timestamp : NativeInt Read FTimeStamp; Property timestamp : NativeInt Read FTimeStamp;
property _type : string read FType; property _type : string read FType;
property isTrusted : Boolean Read FIsTrusted; property isTrusted : Boolean Read FIsTrusted;