diff --git a/fullcalendar.module b/fullcalendar.module index 7468b4e..2f9682f 100644 --- a/fullcalendar.module +++ b/fullcalendar.module @@ -264,7 +264,7 @@ function fullcalendar_results($view_name = NULL, $view_display = NULL) { return; } - $view->dom_id = str_replace('.view-dom-id-', '', $dom_id); + $view->dom_id = $dom_id; $view->fullcalendar_ajax = TRUE; $view->pre_execute($args); $view->init_style(); diff --git a/js/fullcalendar.ajax.js b/js/fullcalendar.ajax.js index 71d7b8d..eb584fa 100644 --- a/js/fullcalendar.ajax.js +++ b/js/fullcalendar.ajax.js @@ -24,7 +24,8 @@ Drupal.fullcalendar.fullcalendar.prototype.dateChange = function (fields) { }; Drupal.fullcalendar.fullcalendar.prototype.submitInit = function (settings) { - var ajaxView = Drupal.settings.views.ajaxViews[this.dom_id.replace('.view-dom-id-', 'views_dom_id:')]; + var domId = this.dom_id.replace('.view-dom-id-', ''); + var ajaxView = Drupal.settings.views.ajaxViews['views_dom_id:' + domId]; this.tm = settings.theme ? 'ui' : 'fc'; var $submit = this.$calendar.find('.views-exposed-form .views-submit-button'); if (this.$calendar.find('.views-exposed-widget').length == settings.fullcalendar_fields_count + 1) { @@ -35,10 +36,10 @@ Drupal.fullcalendar.fullcalendar.prototype.submitInit = function (settings) { event: 'fullcalendar_submit', url: Drupal.settings.basePath + 'fullcalendar/ajax/results/' + settings.view_name + '/' + settings.view_display + '/' + ajaxView.view_args, fullcalendar: this, - submit: {dom_id: this.dom_id} + submit: {dom_id: domId} }); - $submit_button.click(this.fetchEvents); + $submit_button.click($.proxy(this.fetchEvents, this)); }; Drupal.fullcalendar.fullcalendar.prototype.fetchEvents = function () {