Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REF] Decouple crmD3 angular module from CiviMail #19047

Merged
merged 1 commit into from
Nov 26, 2020
Merged

[REF] Decouple crmD3 angular module from CiviMail #19047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CRM/Mailing/Info.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 1 addition & 0 deletions Civi/Angular/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
8 changes: 2 additions & 6 deletions ang/crmD3.ang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
1 change: 0 additions & 1 deletion ang/crmMailing.ang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 0 additions & 1 deletion ang/crmMailingAB.ang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down