Browse Source

* Corrections so all webidsls compile

Michael Van Canneyt 1 year ago
parent
commit
96adefd518
2 changed files with 23 additions and 3 deletions
  1. 22 2
      demo/wasienv/dom/job_js.pas
  2. 1 1
      demo/wasienv/dom/job_webalias.txt

+ 22 - 2
demo/wasienv/dom/job_js.pas

@@ -21,7 +21,7 @@ const
   MaxSafeIntDouble =  $1fffffffffffff; //  9007199254740991
   MaxSafeIntDouble =  $1fffffffffffff; //  9007199254740991
 
 
 Type
 Type
-  TDOMHighResTimeStamp = Int64;
+//  TDOMHighResTimeStamp = Int64;
 
 
   PJOBObjectID = ^TJOBObjectID;
   PJOBObjectID = ^TJOBObjectID;
 
 
@@ -239,7 +239,10 @@ type
     function ReadJSPropertyObject(const aName: string; aResultClass: TJSObjectClass): TJSObject; virtual;
     function ReadJSPropertyObject(const aName: string; aResultClass: TJSObjectClass): TJSObject; virtual;
     function ReadJSPropertyUtf8String(const aName: string): string; virtual;
     function ReadJSPropertyUtf8String(const aName: string): string; virtual;
     function ReadJSPropertyLongInt(const aName: string): LongInt; virtual;
     function ReadJSPropertyLongInt(const aName: string): LongInt; virtual;
+    function ReadJSPropertyInt64(const aName: string): Int64; virtual;
     function ReadJSPropertyValue(const aName: string): TJOB_JSValue; virtual;
     function ReadJSPropertyValue(const aName: string): TJOB_JSValue; virtual;
+    function ReadJSPropertyVariant(const aName: string): Variant; virtual;
+    function ReadJSPropertyMethod(const aName: string): TMethod; virtual;
     // write a property
     // write a property
     procedure WriteJSPropertyBoolean(const aName: string; Value: Boolean); virtual;
     procedure WriteJSPropertyBoolean(const aName: string; Value: Boolean); virtual;
     procedure WriteJSPropertyDouble(const aName: string; Value: Double); virtual;
     procedure WriteJSPropertyDouble(const aName: string; Value: Double); virtual;
@@ -247,6 +250,10 @@ type
     procedure WriteJSPropertyUtf8String(const aName: string; const Value: String); virtual;
     procedure WriteJSPropertyUtf8String(const aName: string; const Value: String); virtual;
     procedure WriteJSPropertyObject(const aName: string; Value: IJSObject); virtual;
     procedure WriteJSPropertyObject(const aName: string; Value: IJSObject); virtual;
     procedure WriteJSPropertyLongInt(const aName: string; Value: LongInt); virtual;
     procedure WriteJSPropertyLongInt(const aName: string; Value: LongInt); virtual;
+    procedure WriteJSPropertyInt64(const aName: string; Value: Int64); virtual;
+    procedure WriteJSPropertyValue(const aName: string; Value: TJOB_JSValue); virtual;
+    procedure WriteJSPropertyVariant(const aName: string; const Value: Variant); virtual;
+    procedure WriteJSPropertyMethod(const aName: string; const Value: TMethod); virtual;
     // create a new object using the new-operator
     // create a new object using the new-operator
     function NewJSObject(Const Args: Array of const; aResultClass: TJSObjectClass): TJSObject; virtual;
     function NewJSObject(Const Args: Array of const; aResultClass: TJSObjectClass): TJSObject; virtual;
     // JS members
     // JS members
@@ -332,6 +339,7 @@ type
     function ReadJSPropertyInt64(const aName: string): Int64; virtual;
     function ReadJSPropertyInt64(const aName: string): Int64; virtual;
     function ReadJSPropertyValue(const aName: string): TJOB_JSValue; virtual;
     function ReadJSPropertyValue(const aName: string): TJOB_JSValue; virtual;
     function ReadJSPropertyVariant(const aName: string): Variant; virtual;
     function ReadJSPropertyVariant(const aName: string): Variant; virtual;
+    function ReadJSPropertyMethod(const aName: string): TMethod; virtual;
     // write a property
     // write a property
     procedure WriteJSPropertyBoolean(const aName: string; Value: Boolean); virtual;
     procedure WriteJSPropertyBoolean(const aName: string; Value: Boolean); virtual;
     procedure WriteJSPropertyDouble(const aName: string; Value: Double); virtual;
     procedure WriteJSPropertyDouble(const aName: string; Value: Double); virtual;
@@ -342,6 +350,7 @@ type
     procedure WriteJSPropertyInt64(const aName: string; Value: Int64); virtual;
     procedure WriteJSPropertyInt64(const aName: string; Value: Int64); virtual;
     procedure WriteJSPropertyValue(const aName: string; Value: TJOB_JSValue); virtual;
     procedure WriteJSPropertyValue(const aName: string; Value: TJOB_JSValue); virtual;
     procedure WriteJSPropertyVariant(const aName: string; const Value: Variant); virtual;
     procedure WriteJSPropertyVariant(const aName: string; const Value: Variant); virtual;
+    procedure WriteJSPropertyMethod(const aName: string; const Value: TMethod); virtual;
     // create a new object using the new-operator
     // create a new object using the new-operator
     function NewJSObject(Const Args: Array of const; aResultClass: TJSObjectClass): TJSObject; virtual;
     function NewJSObject(Const Args: Array of const; aResultClass: TJSObjectClass): TJSObject; virtual;
     // JS members
     // JS members
@@ -503,7 +512,7 @@ type
   IJSIterator = interface (IJSObject) ['{21E331BA-7B57-42DD-8DCE-B26FEA85C639}']
   IJSIterator = interface (IJSObject) ['{21E331BA-7B57-42DD-8DCE-B26FEA85C639}']
   end;
   end;
   
   
-  TJSIteraror = class(TJSObject,IJSIterator)
+  TJSIterator = class(TJSObject,IJSIterator)
   end;
   end;
 
 
   { IJSArray }
   { IJSArray }
@@ -3167,6 +3176,11 @@ begin
   Result:=InvokeJSVariantResult(aName,[],jiGet);
   Result:=InvokeJSVariantResult(aName,[],jiGet);
 end;
 end;
 
 
+function TJSObject.ReadJSPropertyMethod(const aName: string): TMethod;
+begin
+//  Result:=InvokeJSVariantResult(aName,[],jiGet);
+end;
+
 procedure TJSObject.WriteJSPropertyBoolean(const aName: string; Value: Boolean);
 procedure TJSObject.WriteJSPropertyBoolean(const aName: string; Value: Boolean);
 begin
 begin
   InvokeJSNoResult(aName,[Value],jiSet);
   InvokeJSNoResult(aName,[Value],jiSet);
@@ -3217,6 +3231,12 @@ begin
   InvokeJSNoResult(aName,[Value],jiSet);
   InvokeJSNoResult(aName,[Value],jiSet);
 end;
 end;
 
 
+procedure TJSObject.WriteJSPropertyMethod(const aName: string;
+  const Value: TMethod);
+begin
+  // TODO InvokeJSNoResult(aName,[Value],jiSet);
+end;
+
 function TJSObject.NewJSObject(const Args: array of const;
 function TJSObject.NewJSObject(const Args: array of const;
   aResultClass: TJSObjectClass): TJSObject;
   aResultClass: TJSObjectClass): TJSObject;
 begin
 begin

+ 1 - 1
demo/wasienv/dom/job_webalias.txt

@@ -29,4 +29,4 @@ L10nRegistry=IJSObject
 L10nArgs=IJSArray
 L10nArgs=IJSArray
 DocumentL10n=IJSObject
 DocumentL10n=IJSObject
 DOMApplication=IJSObject
 DOMApplication=IJSObject
-JSString=DOMString
+JSString=IJSString