commit defaf3635c04cd6ca331209a60c30c1463f568e4
Author: Tim Plunkett <git@plnktt.com>
Date:   Sat Feb 4 11:46:23 2012 -0500

    1428536

diff --git a/fullcalendar_options/js/colorbox.fullcalendar.js b/fullcalendar_options/js/colorbox.fullcalendar.js
index 3e019cb..8f48605 100644
--- a/fullcalendar_options/js/colorbox.fullcalendar.js
+++ b/fullcalendar_options/js/colorbox.fullcalendar.js
@@ -1,11 +1,11 @@
 (function($) {
 
 Drupal.fullcalendar.plugins.colorbox = {
-  options: function (fullcalendar) {
-    var settings = Drupal.settings.fullcalendar[fullcalendar.dom_id].colorbox;
+  options: function (fullcalendar, settings) {
     if (!settings.colorbox) {
       return;
     }
+    settings = settings.colorbox;
 
     var options = {
       eventClick: function(calEvent, jsEvent, view) {
diff --git a/fullcalendar_options/js/fullcalendar_options.fullcalendar.js b/fullcalendar_options/js/fullcalendar_options.fullcalendar.js
index 7ea6f67..13abba3 100644
--- a/fullcalendar_options/js/fullcalendar_options.fullcalendar.js
+++ b/fullcalendar_options/js/fullcalendar_options.fullcalendar.js
@@ -1,8 +1,11 @@
 (function($) {
 
 Drupal.fullcalendar.plugins.fullcalendar_options = {
-  options: function (fullcalendar) {
-    var options = Drupal.settings.fullcalendar[fullcalendar.dom_id].fullcalendar_options;
+  options: function (fullcalendar, settings) {
+    if (!settings.fullcalendar_options) {
+      return;
+    }
+    var options = settings.fullcalendar_options;
 
     if (options.dayClick) {
       options.dayClick = function (date, allDay, jsEvent, view) {
diff --git a/js/fullcalendar.fullcalendar.js b/js/fullcalendar.fullcalendar.js
index 138ac0c..ca959eb 100644
--- a/js/fullcalendar.fullcalendar.js
+++ b/js/fullcalendar.fullcalendar.js
@@ -6,8 +6,7 @@
 (function ($) {
 
 Drupal.fullcalendar.plugins.fullcalendar = {
-  options: function (fullcalendar) {
-    var settings = Drupal.settings.fullcalendar[fullcalendar.dom_id];
+  options: function (fullcalendar, settings) {
     var options = {
       eventClick: function (calEvent, jsEvent, view) {
         if (settings.sameWindow) {
diff --git a/js/fullcalendar.library.js b/js/fullcalendar.library.js
index ac86964..819e963 100644
--- a/js/fullcalendar.library.js
+++ b/js/fullcalendar.library.js
@@ -26,7 +26,7 @@ Drupal.fullcalendar.fullcalendar = function (dom_id) {
   for (var i = 0; i < Drupal.settings.fullcalendar[dom_id].weights.length; i++) {
     var $plugin = Drupal.settings.fullcalendar[dom_id].weights[i];
     if ($plugins.hasOwnProperty($plugin) && $.isFunction($plugins[$plugin].options)) {
-      $.extend(this.$options, $plugins[$plugin].options(this));
+      $.extend(this.$options, $plugins[$plugin].options(this, Drupal.settings.fullcalendar[this.dom_id]));
     }
   }
 
