Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-25-11-27-40

[civicrm-core.git] / tools / extensions / org.civicrm.angularex / angularex.php

diff --git a/tools/extensions/org.civicrm.angularex/angularex.php b/tools/extensions/org.civicrm.angularex/angularex.php
index 216105f64611081c456ec962ec2dea8314880bc4..064f725453311ebd296e8522bb6429e9a882b109 100644 (file)
--- a/tools/extensions/org.civicrm.angularex/angularex.php
+++ b/tools/extensions/org.civicrm.angularex/angularex.php
@@ -6,6 +6,7 @@ require_once 'angularex.civix.php';
  * Implementation of hook_civicrm_config
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
+ * @param $config
  */
 function angularex_civicrm_config(&$config) {
   _angularex_civix_civicrm_config($config);
@@ -80,6 +81,7 @@ function angularex_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
  * is installed, disabled, uninstalled.
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
+ * @param $entities
  */
 function angularex_civicrm_managed(&$entities) {
   return _angularex_civix_civicrm_managed($entities);
@@ -93,6 +95,7 @@ function angularex_civicrm_managed(&$entities) {
  * Note: This hook only runs in CiviCRM 4.4+.
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
+ * @param $caseTypes
  */
 function angularex_civicrm_caseTypes(&$caseTypes) {
   _angularex_civix_civicrm_caseTypes($caseTypes);
@@ -102,6 +105,7 @@ function angularex_civicrm_caseTypes(&$caseTypes) {
  * Implementation of hook_civicrm_alterSettingsFolders
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
+ * @param null $metaDataFolders
  */
 function angularex_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
   _angularex_civix_civicrm_alterSettingsFolders($metaDataFolders);
@@ -111,5 +115,9 @@ function angularex_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
  * @param $angularModule
  */
 function angularex_civicrm_angularModules(&$angularModule) {
-  $angularModule['example'] = array('ext' => 'org.civicrm.angularex', 'js' => array('js/example.js'));
+  $angularModule['example'] = array(
+    'ext' => 'org.civicrm.angularex',
+    'js' => array('js/*.js'),
+    'partials' => array('partials'),
+  );
 }