From 450e0068d83467814bc3007d870cd8beeea26f4a Sun, 17 Jul 2011 16:01:21 +0200
From: Bram Goffings <bramgoffings@gmail.com>
Date: Sun, 17 Jul 2011 16:01:02 +0200
Subject: [PATCH] fullcalendar api

diff --git a/fullcalendar_colors/fullcalendar_colors.api.php b/fullcalendar_colors/fullcalendar_colors.api.php
index 7f12362..e5cbcdc 100644
--- a/fullcalendar_colors/fullcalendar_colors.api.php
+++ b/fullcalendar_colors/fullcalendar_colors.api.php
@@ -19,7 +19,7 @@
  * @return
  *   Array of classes that will be processed by FullCalendar for each entity.
  */
-function hook_fullcalendar_colors_class_names($entity) {
+function hook_fullcalendar_colors_css_selectors($entity) {
   $class_names = array();
   $class_names[] = 'my_awesome_class_name';
   $class_names[] = 'another_awesome_class_name';
diff --git a/fullcalendar_colors/fullcalendar_colors.module b/fullcalendar_colors/fullcalendar_colors.module
index aa2c9eb..8da5065 100644
--- a/fullcalendar_colors/fullcalendar_colors.module
+++ b/fullcalendar_colors/fullcalendar_colors.module
@@ -103,9 +103,8 @@
  */
 function fullcalendar_colors_fullcalendar_classes($entity) {
   fullcalendar_colors_include_api();
-  $classes = array();
 
-  $hook = 'fullcalendar_colors_class_names';
+  $hook = 'fullcalendar_colors_css_selectors';
   $selectors = array();
   foreach (module_implements($hook) as $module) {
     // Initialize selector array.
@@ -115,8 +114,6 @@
     $function = $module . '_' . $hook;
     $class_names = $function($entity);
     foreach ($class_names as $class_name) {
-      // Build the classes array.
-      $classes[] = $class_name;
       // Create a valid FullCalendar selector based on the classname.
       $hook_selectors[$class_name] =  $class_name;
     }
@@ -125,7 +122,7 @@
 
   fullcalendar_colors_process_selectors($selectors);
 
-  return $classes;
+  return array();
 }
 
 /**
diff --git a/fullcalendar_colors/modules/node.fullcalendar_colors.inc b/fullcalendar_colors/modules/node.fullcalendar_colors.inc
index 529a19f..9af71ba 100644
--- a/fullcalendar_colors/modules/node.fullcalendar_colors.inc
+++ b/fullcalendar_colors/modules/node.fullcalendar_colors.inc
@@ -6,11 +6,25 @@
  */
 
 /**
- * Implements hook_fullcalendar_colors_class_names().
+ * Implements hook_fullcalendar_colors_css_selectors().
  *
  * Provide colors per node type.
  */
-function node_fullcalendar_colors_class_names($entity) {
+function node_fullcalendar_colors_css_selectors($entity) {
+  return _fullcalendar_colors_node_get_classes($entity);
+}
+
+/**
+ * Implements hook_fullcalendar_classes().
+ */
+function node_fullcalendar_classes($entity) {
+  return _fullcalendar_colors_node_get_classes($entity);
+}
+
+/**
+ * TODO
+ */
+function _fullcalendar_colors_node_get_classes($entity) {
   $class_names = array();
   if (variable_get('fullcalendar_colors_node_types_enabled', FALSE)) {
     if ($entity->entity_type == 'node') {
diff --git a/fullcalendar_colors/modules/taxonomy.fullcalendar_colors.inc b/fullcalendar_colors/modules/taxonomy.fullcalendar_colors.inc
index a05f40f..84b2aee 100644
--- a/fullcalendar_colors/modules/taxonomy.fullcalendar_colors.inc
+++ b/fullcalendar_colors/modules/taxonomy.fullcalendar_colors.inc
@@ -6,11 +6,27 @@
  */
 
 /**
+ * Implements hook_fullcalendar_colors_css_selectors().
+ *
+ * Provide colors per taxonomy term.
+ */
+function taxonomy_fullcalendars_colors_css_selectors($entity) {
+  return _fullcalendar_colors_taxo_get_classes($entity);
+}
+
+/**
+ * Implements hook_fullcalendar_colors_classes().
+ */
+function taxonomy_fullcalendars_colors_classes($entity) {
+  return _fullcalendar_colors_taxo_get_classes($entity);
+}
+
+/**
  * Implements hook_fullcalendar_colors_class_names().
  *
  * Provide colors per taxonomy term.
  */
-function taxonomy_fullcalendar_colors_class_names($entity) {
+function _fullcalendar_colors_taxo_get_classes($entity) {
   $filtered_entity = array_intersect_key((array) $entity, field_info_instances($entity->entity_type, $entity->bundle));
   $tids = _fullcalendar_colors_filter_term_ids($filtered_entity);
   $class_names = array();
diff --git a/fullcalendar_colors/modules/user.fullcalendar_colors.inc b/fullcalendar_colors/modules/user.fullcalendar_colors.inc
index 733b85f..a4692eb 100644
--- a/fullcalendar_colors/modules/user.fullcalendar_colors.inc
+++ b/fullcalendar_colors/modules/user.fullcalendar_colors.inc
@@ -6,11 +6,27 @@
  */
 
 /**
+ * Implements hook_fullcalendar_colors_css_selectors().
+ *
+ * Provide colors per node type.
+ */
+function user_fullcalendar_colors_css_selectors($entity) {
+  return _fullcalendar_colors_user_get_classes($entity);
+}
+
+/**
+ * Implements hook_fullcalendar_classes().
+ */
+function user_fullcalendar_classes($entity) {
+  return _fullcalendar_colors_user_get_classes($entity);
+}
+
+/**
  * Implements hook_fullcalendar_colors_class_names().
  *
  * Provide colors per user role.
  */
-function user_fullcalendar_colors_class_names($entity) {
+function _fullcalendar_colors_user_get_classes($entity) {
   $class_names = array();
   if (variable_get('fullcalendar_colors_user_roles_enabled', FALSE)) {
     if ($entity->entity_type == 'user') {