소스 검색

* Fix event handler signature

michael 6 년 전
부모
커밋
69ca0ce68a
3개의 변경된 파일14개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 1
      demo/fcldb/demorest.lpr
  2. 1 1
      demo/fpreport/frmmain.pp
  3. 12 5
      packages/rtl/web.pas

+ 1 - 1
demo/fcldb/demorest.lpr

@@ -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;

+ 1 - 1
demo/fpreport/frmmain.pp

@@ -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)

+ 12 - 5
packages/rtl/web.pas

@@ -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;