Skip to content

Commit

Permalink
Merge pull request #13912 from colemanw/shortAng
Browse files Browse the repository at this point in the history
NFC - Short array syntax - auto-convert ang dir
  • Loading branch information
seamuslee001 authored Mar 29, 2019
2 parents a073564 + 617697e commit 3de49f9
Show file tree
Hide file tree
Showing 22 changed files with 107 additions and 107 deletions.
6 changes: 3 additions & 3 deletions ang/angularFileUpload.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'js' => array('bower_components/angular-file-upload/angular-file-upload.min.js'),
);
'js' => ['bower_components/angular-file-upload/angular-file-upload.min.js'],
];
6 changes: 3 additions & 3 deletions ang/crmApp.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'js' => array('ang/crmApp.js'),
);
'js' => ['ang/crmApp.js'],
];
16 changes: 8 additions & 8 deletions ang/crmAttachment.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'js' => array('ang/crmAttachment.js'),
'css' => array('ang/crmAttachment.css'),
'partials' => array('ang/crmAttachment'),
'settings' => array(
'js' => ['ang/crmAttachment.js'],
'css' => ['ang/crmAttachment.css'],
'partials' => ['ang/crmAttachment'],
'settings' => [
'token' => \CRM_Core_Page_AJAX_Attachment::createToken(),
),
'requires' => array('angularFileUpload', 'crmResource'),
);
],
'requires' => ['angularFileUpload', 'crmResource'],
];
8 changes: 4 additions & 4 deletions ang/crmAutosave.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'js' => array('ang/crmAutosave.js'),
'requires' => array('crmUtil'),
);
'js' => ['ang/crmAutosave.js'],
'requires' => ['crmUtil'],
];
20 changes: 10 additions & 10 deletions ang/crmCaseType.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@

// ODDITY: This only loads if CiviCase is active.

CRM_Core_Resources::singleton()->addSetting(array(
'crmCaseType' => array(
CRM_Core_Resources::singleton()->addSetting([
'crmCaseType' => [
'REL_TYPE_CNAME' => CRM_Case_XMLProcessor::REL_TYPE_CNAME,
),
));
],
]);

return array(
return [
'ext' => 'civicrm',
'js' => array('ang/crmCaseType.js'),
'css' => array('ang/crmCaseType.css'),
'partials' => array('ang/crmCaseType'),
'requires' => array('ngRoute', 'ui.utils', 'crmUi', 'unsavedChanges', 'crmUtil', 'crmResource'),
);
'js' => ['ang/crmCaseType.js'],
'css' => ['ang/crmCaseType.css'],
'partials' => ['ang/crmCaseType'],
'requires' => ['ngRoute', 'ui.utils', 'crmUi', 'unsavedChanges', 'crmUtil', 'crmResource'],
];
12 changes: 6 additions & 6 deletions ang/crmCxn.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'js' => array('ang/crmCxn.js', 'ang/crmCxn/*.js'),
'css' => array('ang/crmCxn.css'),
'partials' => array('ang/crmCxn'),
'requires' => array('crmUtil', 'ngRoute', 'ngSanitize', 'ui.utils', 'crmUi', 'dialogService', 'crmResource'),
);
'js' => ['ang/crmCxn.js', 'ang/crmCxn/*.js'],
'css' => ['ang/crmCxn.css'],
'partials' => ['ang/crmCxn'],
'requires' => ['crmUtil', 'ngRoute', 'ngSanitize', 'ui.utils', 'crmUi', 'dialogService', 'crmResource'],
];
10 changes: 5 additions & 5 deletions ang/crmD3.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
// ODDITY: Only loads if you have CiviMail permissions.
// ODDITY: Extra resources loaded via CRM_Mailing_Info::getAngularModules.

return array(
return [
'ext' => 'civicrm',
'js' => array(
'js' => [
'ang/crmD3.js',
'bower_components/d3/d3.min.js',
),
'requires' => array(),
);
],
'requires' => [],
];
10 changes: 5 additions & 5 deletions ang/crmExample.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'js' => array('ang/crmExample.js'),
'partials' => array('ang/crmExample'),
'requires' => array('crmUtil', 'ngRoute', 'ui.utils', 'crmUi', 'crmResource'),
);
'js' => ['ang/crmExample.js'],
'partials' => ['ang/crmExample'],
'requires' => ['crmUtil', 'ngRoute', 'ui.utils', 'crmUi', 'crmResource'],
];
14 changes: 7 additions & 7 deletions ang/crmMailing.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
// ODDITY: Only loads if you have CiviMail permissions.
// ODDITY: Extra resources loaded via CRM_Mailing_Info::getAngularModules.

return array(
return [
'ext' => 'civicrm',
'js' => array(
'js' => [
'ang/crmMailing.js',
'ang/crmMailing/*.js',
),
'css' => array('ang/crmMailing.css'),
'partials' => array('ang/crmMailing'),
'requires' => array('crmUtil', 'crmAttachment', 'crmAutosave', 'ngRoute', 'ui.utils', 'crmUi', 'dialogService', 'crmResource'),
);
],
'css' => ['ang/crmMailing.css'],
'partials' => ['ang/crmMailing'],
'requires' => ['crmUtil', 'crmAttachment', 'crmAutosave', 'ngRoute', 'ui.utils', 'crmUi', 'dialogService', 'crmResource'],
];
14 changes: 7 additions & 7 deletions ang/crmMailingAB.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
// ODDITY: Only loads if you have CiviMail permissions.
// ODDITY: Extra resources loaded via CRM_Mailing_Info::getAngularModules.

return array(
return [
'ext' => 'civicrm',
'js' => array(
'js' => [
'ang/crmMailingAB.js',
'ang/crmMailingAB/*.js',
'ang/crmMailingAB/*/*.js',
),
'css' => array('ang/crmMailingAB.css'),
'partials' => array('ang/crmMailingAB'),
'requires' => array('ngRoute', 'ui.utils', 'crmUi', 'crmAttachment', 'crmMailing', 'crmD3', 'crmResource'),
);
],
'css' => ['ang/crmMailingAB.css'],
'partials' => ['ang/crmMailingAB'],
'requires' => ['ngRoute', 'ui.utils', 'crmUi', 'crmAttachment', 'crmMailing', 'crmD3', 'crmResource'],
];
6 changes: 3 additions & 3 deletions ang/crmResource.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
// 'js' => array('js/angular-crmResource/byModule.js'), // One HTTP request per module.
'js' => array('js/angular-crmResource/all.js'), // One HTTP request for all modules.
);
'js' => ['js/angular-crmResource/all.js'], // One HTTP request for all modules.
];
12 changes: 6 additions & 6 deletions ang/crmRouteBinder.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'js' => array('ang/crmRouteBinder.js'),
'css' => array(),
'partials' => array(),
'requires' => array('ngRoute'),
);
'js' => ['ang/crmRouteBinder.js'],
'css' => [],
'partials' => [],
'requires' => ['ngRoute'],
];
14 changes: 7 additions & 7 deletions ang/crmStatusPage.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

// ODDITY: Angular name 'statuspage' doesn't match the file name 'crmStatusPage'.

return array(
return [
'ext' => 'civicrm',
'js' => array('ang/crmStatusPage.js', 'ang/crmStatusPage/*.js'),
'css' => array('ang/crmStatusPage.css'),
'partials' => array('ang/crmStatusPage'),
'settings' => array(),
'requires' => array('crmUi', 'crmUtil', 'ngRoute', 'crmResource'),
);
'js' => ['ang/crmStatusPage.js', 'ang/crmStatusPage/*.js'],
'css' => ['ang/crmStatusPage.css'],
'partials' => ['ang/crmStatusPage'],
'settings' => [],
'requires' => ['crmUi', 'crmUtil', 'ngRoute', 'crmResource'],
];
12 changes: 6 additions & 6 deletions ang/crmUi.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'js' => array('ang/crmUi.js'),
'partials' => array('ang/crmUi'),
'requires' => array(
'js' => ['ang/crmUi.js'],
'partials' => ['ang/crmUi'],
'requires' => [
'crmResource',
'ui.utils',
),
);
],
];
8 changes: 4 additions & 4 deletions ang/crmUtil.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'js' => array('ang/crmUtil.js'),
'requires' => array(),
);
'js' => ['ang/crmUtil.js'],
'requires' => [],
];
6 changes: 3 additions & 3 deletions ang/dialogService.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

// https://github.com/jwstadler/angular-jquery-dialog-service

return array(
return [
'ext' => 'civicrm',
'js' => array('bower_components/angular-jquery-dialog-service/dialog-service.js'),
);
'js' => ['bower_components/angular-jquery-dialog-service/dialog-service.js'],
];
6 changes: 3 additions & 3 deletions ang/ngRoute.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'js' => array('bower_components/angular-route/angular-route.min.js'),
);
'js' => ['bower_components/angular-route/angular-route.min.js'],
];
6 changes: 3 additions & 3 deletions ang/ngSanitize.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'js' => array('bower_components/angular-sanitize/angular-sanitize.min.js'),
);
'js' => ['bower_components/angular-sanitize/angular-sanitize.min.js'],
];
10 changes: 5 additions & 5 deletions ang/ui.bootstrap.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'basePages' => array(),
'js' => array('bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js'),
'css' => array('bower_components/angular-bootstrap/ui-bootstrap-csp.css', 'ang/ui.bootstrap.css'),
);
'basePages' => [],
'js' => ['bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js'],
'css' => ['bower_components/angular-bootstrap/ui-bootstrap-csp.css', 'ang/ui.bootstrap.css'],
];
6 changes: 3 additions & 3 deletions ang/ui.sortable.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'js' => array('bower_components/angular-ui-sortable/sortable.min.js'),
);
'js' => ['bower_components/angular-ui-sortable/sortable.min.js'],
];
6 changes: 3 additions & 3 deletions ang/ui.utils.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'js' => array('bower_components/angular-ui-utils/ui-utils.min.js'),
);
'js' => ['bower_components/angular-ui-utils/ui-utils.min.js'],
];
6 changes: 3 additions & 3 deletions ang/unsavedChanges.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
return [
'ext' => 'civicrm',
'js' => array('bower_components/angular-unsavedChanges/dist/unsavedChanges.min.js'),
);
'js' => ['bower_components/angular-unsavedChanges/dist/unsavedChanges.min.js'],
];

0 comments on commit 3de49f9

Please sign in to comment.