Merge pull request #19047 from colemanw/crmD3

[REF] Decouple crmD3 angular module from CiviMail
civicrm · Nov 26, 2020 · 6960dd4 · 6960dd4
2 parents ab8c4a3 + bca4106
commit 6960dd4
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 9 deletions.
diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
@@ -157,7 +157,6 @@ public function getAngularModules() {
     $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
@@ -123,6 +123,7 @@ public function getModules() {
       $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
@@ -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
@@ -1,7 +1,6 @@
 <?php
 // This file declares an Angular module which can be autoloaded
 // 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
@@ -1,7 +1,6 @@
 <?php
 // This file declares an Angular module which can be autoloaded
 // ODDITY: Only loads if you have CiviMail permissions.
-// ODDITY: Extra resources loaded via CRM_Mailing_Info::getAngularModules.
 
 return [
   'ext' => 'civicrm',