Skip to content

Commit

Permalink
Refactor event render filter so that it always triggers. Allows user …
Browse files Browse the repository at this point in the history
…to over-ride not showing event. Closes #366
  • Loading branch information
stephenharris committed Jul 2, 2016
1 parent c00a01d commit c7db8cb
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions js/frontend.js
Expand Up @@ -172,24 +172,27 @@ jQuery(document).ready(function () {
var category = $(view.calendar.options.id).find(".eo-fc-filter-category").val();
var venue = $(view.calendar.options.id).find(".eo-fc-filter-venue").val();
var tag = $(view.calendar.options.id).find(".eo-fc-filter-tag").val();

var render = true;

if (typeof category !== "undefined" && category !== "" && $.inArray( category, event.category) < 0 ) {
return false;
render = false;
}

if (typeof venue != "undefined" && venue !== "" && venue !== event.venue_slug) {
return false;
render = false;
}

if (typeof tag !== "undefined" && tag !== "" && $.inArray(tag, event.tags) < 0 ) {
return false;
render = false;
}

if( !wp.hooks.applyFilters( 'eventorganiser.fullcalendar_render_event', true, event, element, view ) ){

render = wp.hooks.applyFilters( 'eventorganiser.fullcalendar_render_event', render, event, element, view );

if ( ! render ) {
return false;
}
if ( !view.calendar.options.tooltip ) {

if ( ! view.calendar.options.tooltip ) {
return;
}

Expand Down

0 comments on commit c7db8cb

Please sign in to comment.