afform_html - Simplify; use auto-requires

diff --git a/ext/afform/html/ang/afHtmlAdmin.aff.json b/ext/afform/html/ang/afHtmlAdmin.aff.json
index f058774297caf3b3b87e3b329ab9ac2dab4dd45c..b67e195f41f221cd0b793f9650ef11f5a9ec0432 100644 (file)
--- a/ext/afform/html/ang/afHtmlAdmin.aff.json
+++ b/ext/afform/html/ang/afHtmlAdmin.aff.json
@@ -1,5 +1,4 @@
 {
   "title": "Afform HTML Administration",
-  "server_route": "civicrm/admin/afform-html",
-  "requires":["afCore", "afMoncao", "afHtmlEditor", "afHtmlList"]
+  "server_route": "civicrm/admin/afform-html"
 }

diff --git a/ext/afform/html/ang/afHtmlEditor.aff.json b/ext/afform/html/ang/afHtmlEditor.aff.json
index d55381fed38dc5ec81b1a72096799df889abe66a..f8cd0cc16888fae70b950ea9abbd91418c860a95 100644 (file)
--- a/ext/afform/html/ang/afHtmlEditor.aff.json
+++ b/ext/afform/html/ang/afHtmlEditor.aff.json
@@ -1,4 +1,3 @@
 {
-  "title": "Afform HTML Editor",
-  "requires":["afCore", "afMoncao"]
+  "title": "Afform HTML Editor"
 }

diff --git a/ext/afform/html/ang/afHtmlList.aff.json b/ext/afform/html/ang/afHtmlList.aff.json
index 7293f8e83f7ec72f50721bb1925893159a8fcaf7..e412a325d3983cebb0206d51dd8be9548819b6be 100644 (file)
--- a/ext/afform/html/ang/afHtmlList.aff.json
+++ b/ext/afform/html/ang/afHtmlList.aff.json
@@ -1,4 +1,3 @@
 {
-  "title": "Afform HTML List",
-  "requires":["afCore"]
+  "title": "Afform HTML List"
 }

diff --git a/ext/afform/html/ang/afMoncao.ang.php b/ext/afform/html/ang/afMoncao.ang.php
index 2f896db75d4f603b458fa69a82ba198deb62a586..d394532c1f7030a36bd37b9015cd40226d4b6b71 100644 (file)
--- a/ext/afform/html/ang/afMoncao.ang.php
+++ b/ext/afform/html/ang/afMoncao.ang.php
@@ -19,4 +19,7 @@ return array(
     ],
   ],
   'basePages' => [],
+  'exports' => [
+    'attr' => ['af-monaco'],
+  ],
 );