Skip to content

Commit

Permalink
CRM-20600 - Angular deps - Move from *.js to *.php
Browse files Browse the repository at this point in the history
If third-parties are allowed to alter the HTML content, then they may
introduce new dependencies.  This means that they'll need to delcare those
dependencies.

This commit actually moves the declarations for any in-house modules to PHP.
  • Loading branch information
totten committed May 19, 2017
1 parent be083b6 commit 3932bdf
Show file tree
Hide file tree
Showing 22 changed files with 22 additions and 21 deletions.
1 change: 1 addition & 0 deletions ang/crmAttachment.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
'settings' => array(
'token' => \CRM_Core_Page_AJAX_Attachment::createToken(),
),
'requires' => array('angularFileUpload'),
);
2 changes: 1 addition & 1 deletion ang/crmAttachment.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// crmFile: Manage file attachments
(function (angular, $, _) {

angular.module('crmAttachment', ['angularFileUpload']);
angular.crmDepends('crmAttachment');

// crmAttachment manages the list of files which are attached to a given entity
angular.module('crmAttachment').factory('CrmAttachments', function (crmApi, crmStatus, FileUploader, $q) {
Expand Down
1 change: 1 addition & 0 deletions ang/crmAutosave.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
return array(
'ext' => 'civicrm',
'js' => array('ang/crmAutosave.js'),
'requires' => array('crmUtil'),
);
2 changes: 1 addition & 1 deletion ang/crmAutosave.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// crmAutosave
(function(angular, $, _) {

angular.module('crmAutosave', ['crmUtil']);
angular.crmDepends('crmAutosave');

// usage:
// var autosave = new CrmAutosaveCtrl({
Expand Down
1 change: 1 addition & 0 deletions ang/crmCaseType.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@
'js' => array('ang/crmCaseType.js'),
'css' => array('ang/crmCaseType.css'),
'partials' => array('ang/crmCaseType'),
'requires' => array('ngRoute', 'ui.utils', 'crmUi', 'unsavedChanges', 'crmUtil'),
);
2 changes: 1 addition & 1 deletion ang/crmCaseType.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(function(angular, $, _) {

var crmCaseType = angular.module('crmCaseType', ['ngRoute', 'ui.utils', 'crmUi', 'unsavedChanges', 'crmUtil']);
var crmCaseType = angular.crmDepends('crmCaseType');

// Note: This template will be passed to cloneDeep(), so don't put any funny stuff in here!
var newCaseTypeTemplate = {
Expand Down
1 change: 1 addition & 0 deletions ang/crmCxn.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
'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'),
);
4 changes: 1 addition & 3 deletions ang/crmCxn.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
(function (angular, $, _) {

angular.module('crmCxn', [
'crmUtil', 'ngRoute', 'ngSanitize', 'ui.utils', 'crmUi', 'dialogService'
]);
angular.crmDepends('crmCxn');

angular.module('crmCxn').config([
'$routeProvider',
Expand Down
1 change: 1 addition & 0 deletions ang/crmD3.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
'ang/crmD3.js',
'bower_components/d3/d3.min.js',
),
'requires' => array(),
);
3 changes: 1 addition & 2 deletions ang/crmD3.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
(function (angular, $, _) {
// thin stub for declaring dependencies
angular.module('crmD3', []);
angular.crmDepends('crmD3');
})(angular, CRM.$, CRM._);
1 change: 1 addition & 0 deletions ang/crmExample.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
'ext' => 'civicrm',
'js' => array('ang/crmExample.js'),
'partials' => array('ang/crmExample'),
'requires' => array('crmUtil', 'ngRoute', 'ui.utils', 'crmUi'),
);
4 changes: 1 addition & 3 deletions ang/crmExample.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
(function(angular, $, _) {

angular.module('crmExample', [
'crmUtil', 'ngRoute', 'ui.utils', 'crmUi'
]);
angular.crmDepends('crmExample');

angular.module('crmExample').config([
'$routeProvider',
Expand Down
1 change: 1 addition & 0 deletions ang/crmMailing.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@
),
'css' => array('ang/crmMailing.css'),
'partials' => array('ang/crmMailing'),
'requires' => array('crmUtil', 'crmAttachment', 'crmAutosave', 'ngRoute', 'ui.utils', 'crmUi', 'dialogService'),
);
4 changes: 1 addition & 3 deletions ang/crmMailing.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
(function (angular, $, _) {

angular.module('crmMailing', [
'crmUtil', 'crmAttachment', 'crmAutosave', 'ngRoute', 'ui.utils', 'crmUi', 'dialogService'
]);
angular.crmDepends('crmMailing');

angular.module('crmMailing').config([
'$routeProvider',
Expand Down
1 change: 1 addition & 0 deletions ang/crmMailingAB.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@
),
'css' => array('ang/crmMailingAB.css'),
'partials' => array('ang/crmMailingAB'),
'requires' => array('ngRoute', 'ui.utils', 'crmUi', 'crmAttachment', 'crmMailing', 'crmD3'),
);
2 changes: 1 addition & 1 deletion ang/crmMailingAB.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(function(angular, $, _) {

angular.module('crmMailingAB', ['ngRoute', 'ui.utils', 'crmUi', 'crmAttachment', 'crmMailing', 'crmD3']);
angular.crmDepends('crmMailingAB');
angular.module('crmMailingAB').config([
'$routeProvider',
function($routeProvider) {
Expand Down
1 change: 1 addition & 0 deletions ang/crmStatusPage.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
'css' => array('ang/crmStatusPage.css'),
'partials' => array('ang/crmStatusPage'),
'settings' => array(),
'requires' => array('crmUi', 'crmUtil', 'ngRoute'),
);
5 changes: 1 addition & 4 deletions ang/crmStatusPage.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
(function(angular, $, _) {
// Declare a list of dependencies.
angular.module('statuspage', [
'crmUi', 'crmUtil', 'ngRoute'
]);
angular.crmDepends('statuspage');

// router
angular.module('statuspage').config( function($routeProvider) {
Expand Down
1 change: 1 addition & 0 deletions ang/crmUi.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
'ext' => 'civicrm',
'js' => array('ang/crmUi.js'),
'partials' => array('ang/crmUi'),
'requires' => array(),
);
2 changes: 1 addition & 1 deletion ang/crmUi.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
pageTitle = 'CiviCRM',
documentTitle = 'CiviCRM';

angular.module('crmUi', [])
angular.crmDepends('crmUi')

// example <div crm-ui-accordion crm-title="ts('My Title')" crm-collapsed="true">...content...</div>
// WISHLIST: crmCollapsed should support two-way/continuous binding
Expand Down
1 change: 1 addition & 0 deletions ang/crmUtil.ang.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
return array(
'ext' => 'civicrm',
'js' => array('ang/crmUtil.js'),
'requires' => array(),
);
2 changes: 1 addition & 1 deletion ang/crmUtil.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// crmUi: Sundry UI helpers
(function (angular, $, _) {
angular.module('crmUtil', []);
angular.crmDepends('crmUtil');

// Angular implementation of CRM.api3
// @link http://wiki.civicrm.org/confluence/display/CRMDOC/AJAX+Interface#AJAXInterface-CRM.api3
Expand Down

0 comments on commit 3932bdf

Please sign in to comment.