From ed15d85e7afdceefc9fe21cf6d0eb09f2a5dee92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Tue, 28 Nov 2023 00:17:23 +0100 Subject: [PATCH] * Namespaced HTMLFragment --- .../htmlfragment/namespaced/HTML.Fragment.pas | 3 +++ .../htmlfragment/{ => src}/htmlfragment.pas | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 packages/htmlfragment/namespaced/HTML.Fragment.pas rename packages/htmlfragment/{ => src}/htmlfragment.pas (96%) diff --git a/packages/htmlfragment/namespaced/HTML.Fragment.pas b/packages/htmlfragment/namespaced/HTML.Fragment.pas new file mode 100644 index 0000000..9ff302a --- /dev/null +++ b/packages/htmlfragment/namespaced/HTML.Fragment.pas @@ -0,0 +1,3 @@ +{$DEFINE FPC_DOTTEDUNITS} +unit HTML.Fragment; +{$include ../src/htmlfragment.pas} diff --git a/packages/htmlfragment/htmlfragment.pas b/packages/htmlfragment/src/htmlfragment.pas similarity index 96% rename from packages/htmlfragment/htmlfragment.pas rename to packages/htmlfragment/src/htmlfragment.pas index 74367ac..5ba436b 100644 --- a/packages/htmlfragment/htmlfragment.pas +++ b/packages/htmlfragment/src/htmlfragment.pas @@ -1,4 +1,6 @@ +{$IFNDEF FPC_DOTTEDUNITS} unit htmlfragment; +{$ENDIF} {$mode ObjFPC} {$INTERFACES CORBA} @@ -6,14 +8,21 @@ unit htmlfragment; interface uses +{$IFDEF FPC_DOTTEDUNITS} + {$ifdef pas2js} BrowserApi.Web,{$endif} System.Classes, System.SysUtils, HTML.Utils; +{$ELSE} {$ifdef pas2js} web,{$endif} Classes, SysUtils, Rtl.HTMLUtils; +{$ENDIF} Type TCustomHTMLFragment = class; { TFragmentHandler } +{$IFDEF FPC_DOTTEDUNITS} + IFragmentClient = HTML.Utils.IHTMLClient; +{$ELSE FPC_DOTTEDUNITS} IFragmentClient = Rtl.HTMLUtils.IHTMLClient; - +{$ENDIF FPC_DOTTEDUNITS} TFragmentHandler = Class(TObject) Private @@ -112,7 +121,12 @@ Type implementation -uses rtl.TemplateLoader; +uses +{$IFDEF FPC_DOTTEDUNITS} + Browser.TemplateLoader; +{$ELSE} + rtl.TemplateLoader; +{$ENDIF} Resourcestring SErrCannotPerformOperation = 'Cannot perform operation "%s" when HTML is rendered';