* Merging revisions 1127,1129 from trunk:

    ------------------------------------------------------------------------
    r1127 | michael | 2021-03-30 10:54:19 +0200 (Tue, 30 Mar 2021) | 1 line
    
    * Forgot to commit TSysCharSet
    ------------------------------------------------------------------------
    r1129 | michael | 2021-04-01 10:29:56 +0200 (Thu, 01 Apr 2021) | 1 line
    
    * Fix demo to work again with latest webwidgets
    ------------------------------------------------------------------------

demo/webwidget/designdemo/designdemo.lpi

@@ -28,12 +28,11 @@
     </PublishOptions>
     <RunParams>
       <FormatVersion Value="2"/>
-      <Modes Count="0"/>
     </RunParams>
-    <RequiredPackages Count="1">
-      <Item1>
+    <RequiredPackages>
+      <Item>
         <PackageName Value="lazwebwidgets"/>
-      </Item1>
+      </Item>
     </RequiredPackages>
     <Units>
       <Unit>
@@ -88,16 +87,16 @@
     </Other>
   </CompilerOptions>
   <Debugging>
-    <Exceptions Count="3">
-      <Item1>
+    <Exceptions>
+      <Item>
         <Name Value="EAbort"/>
-      </Item1>
-      <Item2>
+      </Item>
+      <Item>
         <Name Value="ECodetoolError"/>
-      </Item2>
-      <Item3>
+      </Item>
+      <Item>
         <Name Value="EFOpenError"/>
-      </Item3>
+      </Item>
     </Exceptions>
   </Debugging>
 </CONFIG>

demo/webwidget/designdemo/designdemo.lpr

@@ -1,7 +1,7 @@
 program designdemo;
 
 {$mode objfpc}
-{$DEFINE USEIDE}
+{ $DEFINE USEIDE}
 
 uses
   browserapp, JS, Classes, SysUtils, Web, designer, webideclient;

demo/webwidget/designdemo/designer.pp

@@ -70,7 +70,7 @@ Type
 
   { TJumboWidget }
 
-  TJumboWidget = class(TCustomTemplateWidget)
+  TJumboWidget = class(TSimpleTemplateWidget)
   Public
     Constructor Create(aOwner:  TComponent); override;
   end;
@@ -91,7 +91,7 @@ type
 constructor TJumboWidget.Create(aOwner: TComponent);
 begin
   inherited Create(aOwner);
-  Template.Text:='<div class="jumbotron">'+sLineBreak+
+  Template:='<div class="jumbotron">'+sLineBreak+
   '<h1 class="display-4">Hello, world!</h1>'+sLineBreak+
   '<p class="lead">This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>'+sLineBreak+
   '<hr class="my-4">'+sLineBreak+
@@ -145,6 +145,7 @@ begin
     S.Free;
   end;
 end;
+
 function TDesignDemo.DoActive(Event: TEventListenerEvent): boolean;
 
 Const
@@ -164,7 +165,10 @@ begin
   JQuery('.designerToolbar').remove();
   aNewActive:=TJSHTMLElement(event.target);
   aParent:=FPage.FindWidgetByID(String(aNewActive.dataset[STopElementData]));
-  if (FAddWidget<>Nil) and (aParent<>Nil) then
+  if aParent=Nil then
+    aParent:=FPage;
+
+  if (FAddWidget<>Nil) then
     begin
     aNewWidget:=FAddWidget;
     FAddWidget:=Nil;

packages/rtl/sysutils.pas

@@ -34,6 +34,8 @@ Const
   FloatRecDigits = 19;
 
 type
+  TSysCharSet = Set of Char;
+
   { TFloatRec }
   TFloatRec = Record
     Exponent: Integer;