af-fieldset - More updates for switching E=>A

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 99fd3221b7b1b8de3c773e286f6b8d2b7234f31a..a8f55b22732b4b87ba2bb7e8fcae85164f11cd6c 100644 (file)
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -20,6 +20,7 @@ class CRM_Afform_ArrayHtml {
   private $protoSchema = [
     '*' => [
       '*' => 'text',
+      'af-fieldset' => 'text',
     ],
     'af-entity' => [
       '#selfClose' => TRUE,
@@ -32,9 +33,6 @@ class CRM_Afform_ArrayHtml {
       'name' => 'text',
       'defn' => 'js',
     ],
-    'af-fieldset' => [
-      'model' => 'text',
-    ],
     'area' => ['#selfClose' => TRUE],
     'base' => ['#selfClose' => TRUE],
     'br' => ['#selfClose' => TRUE],

diff --git a/ext/afform/core/ang/af.ang.php b/ext/afform/core/ang/af.ang.php
index a97b53814242c7834f93c03208c493f5e2bb12a3..0dae45cef56c8068015211a29d7e92c511747ab7 100644 (file)
--- a/ext/afform/core/ang/af.ang.php
+++ b/ext/afform/core/ang/af.ang.php
@@ -16,7 +16,7 @@ return [
   'basePages' => [],
   'exports' => [
     'af-entity' => 'AE',
-    'af-fieldset' => 'AE',
+    'af-fieldset' => 'A',
     'af-form' => 'AE',
   ],
 ];