paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-10-02 11:59:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Safer UnRender, split templatewidget

Browse Source
This commit is contained in:
michael 2019-09-12 20:34:14 +00:00
parent b60221b7b6
commit 2e22184840
1 changed files with 79 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
packages/webwidget/webwidget.pas
View File

@ -650,22 +650,45 @@ Type
TCustomTemplateWidget = Class(TWebWidget)
private
FContainerTag: String;
FTemplate: TStrings;
procedure DoTemplateChanged(Sender: TObject);
procedure SetContainerTag(AValue: String);
procedure SetTemplate(AValue: TStrings);
Protected
function GetTemplateHTML: String; virtual;
function GetTemplateHTML: String; virtual; abstract;
Procedure ApplyTemplate(aElement : TJSHTMLElement); virtual;
Function DoRenderHTML(aParent, aElement: TJSHTMLElement) : TJSHTMLElement; override;
// The template.
Property Template : TStrings Read FTemplate Write SetTemplate;
// When set, a tag will be created and the template will be rendered below this tag.
Property ContainerTag : String Read FContainerTag Write SetContainerTag;
Public
Function HTMLTag : String; override;
end;
{ TSimpleTemplateWidget }
TSimpleTemplateWidget = Class(TCustomTemplateWidget)
Private
FTemplate: String;
procedure SetTemplate(AValue: String);
Protected
function GetTemplateHTML: String; override;
Published
// The template.
Property Template : String Read FTemplate Write SetTemplate;
Property References;
end;
TTemplateWidget = Class(TCustomTemplateWidget)
Private
FTemplate: TStrings;
procedure DoTemplateChanged(Sender: TObject);
procedure SetTemplate(AValue: TStrings);
Protected
function GetTemplateHTML: String; override;
Public
Constructor Create(aOwner : TComponent); override;
Destructor Destroy; override;
// The template.
Property Template : TStrings Read FTemplate Write SetTemplate;
Property References;
end;
implementation
@ -684,6 +707,21 @@ ResourceString
SErrNotRendered = 'Cannot perform this operation: Widget not rendered';
SErrCannotRefreshNoWidget = 'Cannot refresh references without widget';
{ TSimpleTemplateWidget }
procedure TSimpleTemplateWidget.SetTemplate(AValue: String);
begin
FTemplate:=AValue;
if isRendered then
Refresh;
end;
function TSimpleTemplateWidget.GetTemplateHTML: String;
begin
Result:=FTemplate;
end;
{ TWebWidgetReferences }
function TWebWidgetReferences.GetReferenceItem(aIndex : Integer): TReferenceItem;
@ -869,17 +907,6 @@ end;
{ TCustomTemplateWidget }
procedure TCustomTemplateWidget.SetTemplate(AValue: TStrings);
begin
if FTemplate=AValue then Exit;
FTemplate.Assign(AValue);
end;
function TCustomTemplateWidget.GetTemplateHTML: String;
begin
Result:=FTemplate.Text;
end;
procedure TCustomTemplateWidget.ApplyTemplate(aElement: TJSHTMLElement);
begin
aElement.InnerHTML:=GetTemplateHTML;
@ -899,17 +926,6 @@ begin
end;
end;
function TCustomTemplateWidget.HTMLTag: String;
begin
Result:=ContainerTag;
end;
procedure TCustomTemplateWidget.DoTemplateChanged(Sender: TObject);
begin
if isRendered then
Refresh;
end;
procedure TCustomTemplateWidget.SetContainerTag(AValue: String);
begin
if FContainerTag=AValue then Exit;
@ -918,7 +934,32 @@ begin
Refresh;
end;
constructor TCustomTemplateWidget.Create(aOwner: TComponent);
function TCustomTemplateWidget.HTMLTag: String;
begin
Result:=ContainerTag;
end;
{ TTemplateWidget }
procedure TTemplateWidget.SetTemplate(AValue: TStrings);
begin
if FTemplate=AValue then Exit;
FTemplate.Assign(AValue);
end;
function TTemplateWidget.GetTemplateHTML: String;
begin
Result:=FTemplate.Text;
end;
procedure TTemplateWidget.DoTemplateChanged(Sender: TObject);
begin
if isRendered then
Refresh;
end;
constructor TTemplateWidget.Create(aOwner: TComponent);
begin
inherited Create(aOwner);
@ -927,7 +968,7 @@ begin
FContainerTag:='';
end;
destructor TCustomTemplateWidget.Destroy;
destructor TTemplateWidget.Destroy;
begin
FreeAndNil(FTemplate);
@ -1873,11 +1914,18 @@ end;
procedure TCustomWebWidget.DoUnRender(aParent: TJSHTMLElement);
Var
el : TJSHTMLElement;
begin
if Assigned(aParent) and Assigned(FElement) then
begin
if FOwnsElement then
aParent.removeChild(TopElement);
begin
el:=TopElement;
if (El.ParentElement=aParent) then
aParent.removeChild(el);
end;
InvalidateElement;
end;
end;