Decouple crmD3 angular module from CiviMail

The crmD3 module was being conditionally loaded based on whether CiviMail was enabled.
This changes it to always exist but only loaded as required.

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index fa647e4679cde83681de3ffca161bc3aff698774..d26c57dc993069fb7884d26eb510072f4c0c698d 100644 (file)
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -157,7 +157,6 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     $result = [];
     $result['crmMailing'] = include "$civicrm_root/ang/crmMailing.ang.php";
     $result['crmMailingAB'] = include "$civicrm_root/ang/crmMailingAB.ang.php";
-    $result['crmD3'] = include "$civicrm_root/ang/crmD3.ang.php";
 
     return $result;
   }

diff --git a/Civi/Angular/Manager.php b/Civi/Angular/Manager.php
index d19c8c328ee586649d9ee9589a3f3e9474d8bab8..5f64eed33653cf1066b4d7a04917ab7b4ae088d6 100644 (file)
--- a/Civi/Angular/Manager.php
+++ b/Civi/Angular/Manager.php
@@ -123,6 +123,7 @@ class Manager {
       $angularModules['api4Explorer'] = include "$civicrm_root/ang/api4Explorer.ang.php";
       $angularModules['api4'] = include "$civicrm_root/ang/api4.ang.php";
       $angularModules['crmDashboard'] = include "$civicrm_root/ang/crmDashboard.ang.php";
+      $angularModules['crmD3'] = include "$civicrm_root/ang/crmD3.ang.php";
 
       foreach (\CRM_Core_Component::getEnabledComponents() as $component) {
         $angularModules = array_merge($angularModules, $component->getAngularModules());

diff --git a/ang/crmD3.ang.php b/ang/crmD3.ang.php
index 0a737341ae811a58d6002d00b478df23b13930d3..c95c53fd106f40132918a51195ffdbc8f3bde88c 100644 (file)
--- a/ang/crmD3.ang.php
+++ b/ang/crmD3.ang.php
@@ -1,13 +1,9 @@
 <?php
-// This file declares an Angular module which can be autoloaded
-// in CiviCRM. See also:
-// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
-
-// ODDITY: Only loads if you have CiviMail permissions.
-// ODDITY: Extra resources loaded via CRM_Mailing_Info::getAngularModules.
+// This module provides the D3 graphing library
 
 return [
   'ext' => 'civicrm',
+  'basePages' => [],
   'js' => [
     'ang/crmD3.js',
     'bower_components/d3/d3.min.js',

diff --git a/ang/crmMailing.ang.php b/ang/crmMailing.ang.php
index a91d495221145168616754f1f209b7d2b1e6ea67..091ecfda87b95a1ccfa58f525e9911e036d5bd22 100644 (file)
--- a/ang/crmMailing.ang.php
+++ b/ang/crmMailing.ang.php
@@ -4,7 +4,6 @@
 // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
 
 // ODDITY: Only loads if you have CiviMail permissions.
-// ODDITY: Extra resources loaded via CRM_Mailing_Info::getAngularModules.
 
 return [
   'ext' => 'civicrm',

diff --git a/ang/crmMailingAB.ang.php b/ang/crmMailingAB.ang.php
index 6741399ebc9ab6800f440faf61e13da731e2c03d..b8db8b6cb86e8e4bfe13d69a69a5981cfda6ba40 100644 (file)
--- a/ang/crmMailingAB.ang.php
+++ b/ang/crmMailingAB.ang.php
@@ -4,7 +4,6 @@
 // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
 
 // ODDITY: Only loads if you have CiviMail permissions.
-// ODDITY: Extra resources loaded via CRM_Mailing_Info::getAngularModules.
 
 return [
   'ext' => 'civicrm',