|
@@ -890,15 +890,19 @@ Type
|
|
private
|
|
private
|
|
FElementTag: THTMLElementTag;
|
|
FElementTag: THTMLElementTag;
|
|
FTextContent: String;
|
|
FTextContent: String;
|
|
|
|
+ FTextMode: TTextMode;
|
|
procedure SetElementTag(AValue: THTMLElementTag);
|
|
procedure SetElementTag(AValue: THTMLElementTag);
|
|
procedure SetTextContent(AValue: String);
|
|
procedure SetTextContent(AValue: String);
|
|
|
|
+ procedure SetTextMode(AValue: TTextMode);
|
|
Protected
|
|
Protected
|
|
Procedure ApplyWidgetSettings(aElement: TJSHTMLElement); override;
|
|
Procedure ApplyWidgetSettings(aElement: TJSHTMLElement); override;
|
|
Function HTMLTag : String; override;
|
|
Function HTMLTag : String; override;
|
|
// Set tag you wish to use
|
|
// Set tag you wish to use
|
|
Property elementTag : THTMLElementTag Read FElementTag Write SetElementTag;
|
|
Property elementTag : THTMLElementTag Read FElementTag Write SetElementTag;
|
|
- // If set, the text will be set as InnerText of the tag
|
|
|
|
|
|
+ // If set, the text will be set as InnerText or InnerHTML of the tag
|
|
Property TextContent : String Read FTextContent Write SetTextContent;
|
|
Property TextContent : String Read FTextContent Write SetTextContent;
|
|
|
|
+ // Use InnerHTML or InnerText when setting TextContent
|
|
|
|
+ Property TextMode : TTextMode Read FTextMode Write SetTextMode;
|
|
end;
|
|
end;
|
|
|
|
|
|
{ TTagWidget }
|
|
{ TTagWidget }
|
|
@@ -909,6 +913,7 @@ Type
|
|
Published
|
|
Published
|
|
Property elementTag;
|
|
Property elementTag;
|
|
Property TextContent;
|
|
Property TextContent;
|
|
|
|
+ Property TextMode;
|
|
end;
|
|
end;
|
|
|
|
|
|
TDivWidget = Class(TCustomTagWidget)
|
|
TDivWidget = Class(TCustomTagWidget)
|
|
@@ -3172,11 +3177,20 @@ begin
|
|
Refresh;
|
|
Refresh;
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
+procedure TCustomTagWidget.SetTextMode(AValue: TTextMode);
|
|
|
|
+begin
|
|
|
|
+ if FTextMode=AValue then Exit;
|
|
|
|
+ FTextMode:=AValue;
|
|
|
|
+ if IsRendered then Refresh;
|
|
|
|
+end;
|
|
|
|
+
|
|
procedure TCustomTagWidget.ApplyWidgetSettings(aElement: TJSHTMLElement);
|
|
procedure TCustomTagWidget.ApplyWidgetSettings(aElement: TJSHTMLElement);
|
|
begin
|
|
begin
|
|
inherited ApplyWidgetSettings(aElement);
|
|
inherited ApplyWidgetSettings(aElement);
|
|
- if FTextContent<>'' then
|
|
|
|
- aElement.InnerText:=TextContent;
|
|
|
|
|
|
+ if TextMode=tmText then
|
|
|
|
+ aElement.InnerText:=TextContent
|
|
|
|
+ else
|
|
|
|
+ aElement.InnerHTML:=TextContent
|
|
end;
|
|
end;
|
|
|
|
|
|
function TCustomTagWidget.HTMLTag: String;
|
|
function TCustomTagWidget.HTMLTag: String;
|