The Events Calendar - Version 3.11.2

Version Description

Download this release

Release Info

Developer zbtirrell
Plugin Icon The Events Calendar
Version 3.11.2
Comparing to
See all releases

Code changes from version 3.11.1 to 3.11.2

Files changed (6) hide show
  1. readme.txt +9 -4
  2. src/Tribe/Main.php +1 -1
  3. src/Tribe/iCal.php +4 -2
  4. src/resources/js/tribe-events-ajax-list.js +37 -6
  5. src/resources/js/tribe-events-ajax-list.min.js +1 -1
  6. the-events-calendar.php +1 -1
readme.txt CHANGED
@@ -4,8 +4,8 @@ Contributors: ModernTribe, roblagatta, borkweb, zbtirrell, barry.hughes, bordon
4
  Tags: events, calendar, event, venue, organizer, dates, date, google maps, conference, workshop, concert, meeting, seminar, summit, class, modern tribe, tribe, widget
5
  Donate link: http://m.tri.be/29
6
  Requires at least: 3.9
7
- Tested up to: 4.2.3
8
- Stable tag: 3.11.1
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
@@ -136,9 +136,9 @@ No, this plugin does not use a shortcode nor is one available at the time being.
136
 
137
  = Are there any troubleshooting steps you'd suggest I try that might resolve my issue before I post a new thread? =
138
 
139
- First, make sure that you're running the latest version of The Events Calendar (3.10 as of this release). If you're running Events Calendar PRO it needs to match the version number of The Events Calendar. And if you've got any other add-ons, make sure those are current / running the latest code as well.
140
 
141
- The most common issues we see are either plugin or theme conflicts. You can test if a plugin or theme is conflicting by manually deactivating other plugins until just The Events Calendar 3.10 is running on your site. If the issue persists from there, revert to the default Twenty Fourteen theme. If the issue is resolved after deactivating a specific plugin or your theme, you'll know that is the source of the conflict.
142
 
143
  Note that we aren't going to say "tough luck" if you identify a plugin/theme conflict. While we can't guarantee 100% integration with any plugin or theme out there, we will do our best (and reach out the plugin/theme author as needed) to figure out a solution that benefits everyone.
144
 
@@ -312,6 +312,11 @@ At no point during the 3.0 lifecycle will the major version change. But you can
312
 
313
  == Changelog ==
314
 
 
 
 
 
 
315
  = [3.11.1] 2015-07-28 =
316
 
317
  * Bug - Fixed bug where all events regardless of category were shown on category month views while paging through months (thanks to our long-time user Anthony of Design Big Dreams for the first report here!)
4
  Tags: events, calendar, event, venue, organizer, dates, date, google maps, conference, workshop, concert, meeting, seminar, summit, class, modern tribe, tribe, widget
5
  Donate link: http://m.tri.be/29
6
  Requires at least: 3.9
7
+ Tested up to: 4.3 beta 3
8
+ Stable tag: 3.11.2
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
136
 
137
  = Are there any troubleshooting steps you'd suggest I try that might resolve my issue before I post a new thread? =
138
 
139
+ First, make sure that you're running the latest version of The Events Calendar (3.11.2 as of this release). If you're running Events Calendar PRO it needs to match the version number of The Events Calendar. And if you've got any other add-ons, make sure those are current / running the latest code as well.
140
 
141
+ The most common issues we see are either plugin or theme conflicts. You can test if a plugin or theme is conflicting by manually deactivating other plugins until just The Events Calendar 3.11.2 is running on your site. If the issue persists from there, revert to the default Twenty Fourteen theme. If the issue is resolved after deactivating a specific plugin or your theme, you'll know that is the source of the conflict.
142
 
143
  Note that we aren't going to say "tough luck" if you identify a plugin/theme conflict. While we can't guarantee 100% integration with any plugin or theme out there, we will do our best (and reach out the plugin/theme author as needed) to figure out a solution that benefits everyone.
144
 
312
 
313
  == Changelog ==
314
 
315
+ = [3.11.2] 2015-07-30 =
316
+
317
+ * Bug - Resolved issue where List View paging into the past only allowed you to go 1 page in the past (thanks to Richard from Prescott Art Store for reporting this!)
318
+ * Bug - Fixed bug where the iCal export for Month View inappropriately observed the events-per-page limit causing some events to be excluded (thanks to Neil on the forums for the heads up!)
319
+
320
  = [3.11.1] 2015-07-28 =
321
 
322
  * Bug - Fixed bug where all events regardless of category were shown on category month views while paging through months (thanks to our long-time user Anthony of Design Big Dreams for the first report here!)
src/Tribe/Main.php CHANGED
@@ -24,7 +24,7 @@ if ( ! class_exists( 'Tribe__Events__Main' ) ) {
24
  const VENUE_POST_TYPE = 'tribe_venue';
25
  const ORGANIZER_POST_TYPE = 'tribe_organizer';
26
 
27
- const VERSION = '3.11.1';
28
  const MIN_ADDON_VERSION = '3.11';
29
  const FEED_URL = 'https://theeventscalendar.com/feed/';
30
  const INFO_API_URL = 'http://wpapi.org/api/plugin/the-events-calendar.php';
24
  const VENUE_POST_TYPE = 'tribe_venue';
25
  const ORGANIZER_POST_TYPE = 'tribe_organizer';
26
 
27
+ const VERSION = '3.11.2';
28
  const MIN_ADDON_VERSION = '3.11';
29
  const FEED_URL = 'https://theeventscalendar.com/feed/';
30
  const INFO_API_URL = 'http://wpapi.org/api/plugin/the-events-calendar.php';
src/Tribe/iCal.php CHANGED
@@ -165,8 +165,10 @@ class Tribe__Events__iCal {
165
 
166
  $args = array(
167
  'eventDisplay' => 'custom',
168
- 'start_date' => Tribe__Events__Template__Month::calculate_first_cell_date( $month ),
169
- 'end_date' => Tribe__Events__Template__Month::calculate_final_cell_date( $month ),
 
 
170
  );
171
 
172
  /**
165
 
166
  $args = array(
167
  'eventDisplay' => 'custom',
168
+ 'start_date' => Tribe__Events__Template__Month::calculate_first_cell_date( $month ),
169
+ 'end_date' => Tribe__Events__Template__Month::calculate_final_cell_date( $month ),
170
+ 'posts_per_page' => -1,
171
+ 'hide_upcoming' => true,
172
  );
173
 
174
  /**
src/resources/js/tribe-events-ajax-list.js CHANGED
@@ -82,10 +82,28 @@
82
 
83
  td.cur_url = tf.url_path( href );
84
 
85
- if ( ! ts.paged ) {
86
- ts.paged = 2;
 
 
 
 
87
  } else {
88
- ts.paged++;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
89
  }
90
 
91
  ts.popping = false;
@@ -105,17 +123,30 @@
105
 
106
  if ( $( this ).parent().is( '.tribe-events-past' ) ) {
107
  ts.view = 'past';
108
- } else if ( 'undefined' !== result[1] ) {
109
  ts.view = result[1];
110
  } else {
111
  ts.view = 'list';
112
  }
113
 
 
 
 
114
  td.cur_url = tf.url_path( $( this ).attr( 'href' ) );
115
 
116
- if ( ts.paged > 1 ) {
117
- ts.paged--;
 
 
 
 
 
 
 
 
 
118
  }
 
119
  ts.popping = false;
120
  tf.pre_ajax( function() {
121
  tribe_events_list_ajax_post();
82
 
83
  td.cur_url = tf.url_path( href );
84
 
85
+ reg = /tribe_paged=([^&]+)/ig;
86
+ result = reg.exec( href );
87
+
88
+ // use what is on the URL if possible
89
+ if ( 'undefined' !== typeof result[1] ) {
90
+ ts.paged = result[1];
91
  } else {
92
+ // otherwise figure it out based on the current page and direction
93
+ if ( 'list' === ts.view ) {
94
+ if ( ! ts.paged ) {
95
+ ts.paged = 2;
96
+ } else {
97
+ ts.paged++;
98
+ }
99
+ } else {
100
+ if ( ! ts.paged ) {
101
+ ts.view = 'list';
102
+ ts.paged = 1;
103
+ } else {
104
+ ts.paged--;
105
+ }
106
+ }
107
  }
108
 
109
  ts.popping = false;
123
 
124
  if ( $( this ).parent().is( '.tribe-events-past' ) ) {
125
  ts.view = 'past';
126
+ } else if ( 'undefined' !== typeof result[1] ) {
127
  ts.view = result[1];
128
  } else {
129
  ts.view = 'list';
130
  }
131
 
132
+ reg = /tribe_paged=([^&]+)/ig;
133
+ result = reg.exec( href );
134
+
135
  td.cur_url = tf.url_path( $( this ).attr( 'href' ) );
136
 
137
+ if ( 'undefined' !== typeof result[1] ) {
138
+ ts.paged = result[1];
139
+ } else if ( 'list' === ts.view ) {
140
+ if ( ts.paged > 1 ) {
141
+ ts.paged--;
142
+ } else {
143
+ ts.paged = 1;
144
+ ts.view = 'past';
145
+ }
146
+ } else {
147
+ ts.paged++;
148
  }
149
+
150
  ts.popping = false;
151
  tf.pre_ajax( function() {
152
  tribe_events_list_ajax_post();
src/resources/js/tribe-events-ajax-list.min.js CHANGED
@@ -1 +1 @@
1
- !function(a,b,c,d,e,f,g,h,i,j){c(b).ready(function(){function j(a){if("change_view"!=tribe_events_bar_action){if(a.preventDefault(),g.ajax_running)return;var c=b.location.pathname;g.paged=1,c.match(/\/all\/$/)?g.view="all":g.view="list",g.popping=!1,f.pre_ajax(function(){k()})}}function k(){var j=c("#tribe-events-header");if(g.ajax_running=!0,!g.popping){g.filter_cats&&(d.cur_url=j.data("baseurl"));var k=c("#tribe-events-list-hash").val();g.params={action:"tribe_list",tribe_paged:g.paged,tribe_event_display:g.view},g.url_params={tribe_paged:g.paged,tribe_event_display:g.view};var l=b.location.pathname;if((l.match(/\/all\/$/)||d.cur_url.match(/tribe_post_parent=[0-9]+/))&&(g.url_params.tribe_event_display="all",g.params.tribe_post_parent=parseInt(j.closest("#tribe-events-content").find("[data-parent-post-id]:first").data("parent-post-id"),10)),""===tribe_js_config.permalink_settings&&(g.url_params.eventDisplay="all"===g.url_params.tribe_event_display?"all":"list"),k.length&&(g.params.hash=k),d.default_permalinks&&!g.url_params.hasOwnProperty("post_type")&&(g.url_params.post_type=i.events_post_type),g.category&&(g.params.tribe_event_category=g.category),c(e).trigger("tribe_ev_serializeBar"),f.invalid_date_in_params(g.params))return void(g.ajax_running=!1);c("#tribe-events-content .tribe-events-loop").tribe_spin(),g.params=c.param(g.params),g.url_params=c.param(g.url_params),c(e).trigger("tribe_ev_collectParams"),g.pushstate=!1,g.do_string=!0}h.pushstate&&!g.filter_cats?(c(e).trigger("tribe_ev_ajaxStart").trigger("tribe_ev_listView_AjaxStart"),c.post(TribeList.ajaxurl,g.params,function(a){if(g.initial_load=!1,f.enable_inputs("#tribe_events_filters_form","input, select"),a.success){g.ajax_running=!1,d.ajax_response={total_count:parseInt(a.total_count),view:a.view,max_pages:a.max_pages,tribe_paged:a.tribe_paged,timestamp:(new Date).getTime()},c("#tribe-events-list-hash").val(a.hash);var h=c.parseHTML(a.html);c("#tribe-events-content").replaceWith(h),0===a.total_count&&c("#tribe-events-header .tribe-events-sub-nav").empty(),g.page_title=c("#tribe-events-header").data("title"),b.title=g.page_title,g.do_string&&history.pushState({tribe_params:g.params,tribe_url_params:g.url_params},g.page_title,d.cur_url+"?"+g.url_params),g.pushstate&&history.pushState({tribe_params:g.params,tribe_url_params:g.url_params},g.page_title,d.cur_url),c(e).trigger("tribe_ev_ajaxSuccess").trigger("tribe_ev_listView_AjaxSuccess")}})):g.url_params.length?a.location=d.cur_url+"?"+g.url_params:a.location=d.cur_url}var l=f.get_url_param("tribe_paged"),m=c("#tribe-events > .tribe-events-venue");if(l&&(g.paged=l),h.pushstate&&!h.map_view()){var n="action=tribe_list&tribe_paged="+g.paged;d.params.length&&(n=n+"&"+d.params),g.category&&(n=n+"&tribe_event_category="+g.category),history.replaceState({tribe_params:n,tribe_url_params:d.params},b.title,location.href),c(a).on("popstate",function(a){var b=a.originalEvent.state;b&&!m.length&&(g.do_string=!1,g.pushstate=!1,g.popping=!0,g.params=b.tribe_params,g.url_params=b.tribe_url_params,f.pre_ajax(function(){k()}),f.set_form(g.params))})}c("#tribe-events-content-wrapper").on("click",'ul.tribe-events-sub-nav a[rel="next"]',function(a){if(a.preventDefault(),!g.ajax_running){var b=c(this).attr("href"),e=/tribe_event_display=([^&]+)/gi,h=e.exec(b);c(this).parent().is(".tribe-events-past")?g.view="past":"undefined"!==h[1]?g.view=h[1]:g.view="list",d.cur_url=f.url_path(b),g.paged?g.paged++:g.paged=2,g.popping=!1,f.pre_ajax(function(){k()})}}).on("click",'ul.tribe-events-sub-nav a[rel="prev"]',function(a){if(a.preventDefault(),!g.ajax_running){var b=c(this).attr("href"),e=/tribe_event_display=([^&]+)/gi,h=e.exec(b);c(this).parent().is(".tribe-events-past")?g.view="past":"undefined"!==h[1]?g.view=h[1]:g.view="list",d.cur_url=f.url_path(c(this).attr("href")),g.paged>1&&g.paged--,g.popping=!1,f.pre_ajax(function(){k()})}}),f.snap("#tribe-events-content-wrapper","#tribe-events-content-wrapper","#tribe-events-footer .tribe-events-nav-previous a, #tribe-events-footer .tribe-events-nav-next a"),(h.no_bar()||h.live_ajax()&&h.pushstate)&&c("#tribe-events-bar").on("changeDate","#tribe-bar-date",function(a){h.reset_on()||(g.popping=!1,j(a))}),c("form#tribe-bar-form").on("submit",function(a){g.popping=!1,j(a)}),c(e).on("tribe_ev_runAjax",function(){k()})})}(window,document,jQuery,tribe_ev.data,tribe_ev.events,tribe_ev.fn,tribe_ev.state,tribe_ev.tests,tribe_js_config,tribe_debug);
1
+ !function(a,b,c,d,e,f,g,h,i,j){c(b).ready(function(){function j(a){if("change_view"!=tribe_events_bar_action){if(a.preventDefault(),g.ajax_running)return;var c=b.location.pathname;g.paged=1,c.match(/\/all\/$/)?g.view="all":g.view="list",g.popping=!1,f.pre_ajax(function(){k()})}}function k(){var j=c("#tribe-events-header");if(g.ajax_running=!0,!g.popping){g.filter_cats&&(d.cur_url=j.data("baseurl"));var k=c("#tribe-events-list-hash").val();g.params={action:"tribe_list",tribe_paged:g.paged,tribe_event_display:g.view},g.url_params={tribe_paged:g.paged,tribe_event_display:g.view};var l=b.location.pathname;if((l.match(/\/all\/$/)||d.cur_url.match(/tribe_post_parent=[0-9]+/))&&(g.url_params.tribe_event_display="all",g.params.tribe_post_parent=parseInt(j.closest("#tribe-events-content").find("[data-parent-post-id]:first").data("parent-post-id"),10)),""===tribe_js_config.permalink_settings&&(g.url_params.eventDisplay="all"===g.url_params.tribe_event_display?"all":"list"),k.length&&(g.params.hash=k),d.default_permalinks&&!g.url_params.hasOwnProperty("post_type")&&(g.url_params.post_type=i.events_post_type),g.category&&(g.params.tribe_event_category=g.category),c(e).trigger("tribe_ev_serializeBar"),f.invalid_date_in_params(g.params))return void(g.ajax_running=!1);c("#tribe-events-content .tribe-events-loop").tribe_spin(),g.params=c.param(g.params),g.url_params=c.param(g.url_params),c(e).trigger("tribe_ev_collectParams"),g.pushstate=!1,g.do_string=!0}h.pushstate&&!g.filter_cats?(c(e).trigger("tribe_ev_ajaxStart").trigger("tribe_ev_listView_AjaxStart"),c.post(TribeList.ajaxurl,g.params,function(a){if(g.initial_load=!1,f.enable_inputs("#tribe_events_filters_form","input, select"),a.success){g.ajax_running=!1,d.ajax_response={total_count:parseInt(a.total_count),view:a.view,max_pages:a.max_pages,tribe_paged:a.tribe_paged,timestamp:(new Date).getTime()},c("#tribe-events-list-hash").val(a.hash);var h=c.parseHTML(a.html);c("#tribe-events-content").replaceWith(h),0===a.total_count&&c("#tribe-events-header .tribe-events-sub-nav").empty(),g.page_title=c("#tribe-events-header").data("title"),b.title=g.page_title,g.do_string&&history.pushState({tribe_params:g.params,tribe_url_params:g.url_params},g.page_title,d.cur_url+"?"+g.url_params),g.pushstate&&history.pushState({tribe_params:g.params,tribe_url_params:g.url_params},g.page_title,d.cur_url),c(e).trigger("tribe_ev_ajaxSuccess").trigger("tribe_ev_listView_AjaxSuccess")}})):g.url_params.length?a.location=d.cur_url+"?"+g.url_params:a.location=d.cur_url}var l=f.get_url_param("tribe_paged"),m=c("#tribe-events > .tribe-events-venue");if(l&&(g.paged=l),h.pushstate&&!h.map_view()){var n="action=tribe_list&tribe_paged="+g.paged;d.params.length&&(n=n+"&"+d.params),g.category&&(n=n+"&tribe_event_category="+g.category),history.replaceState({tribe_params:n,tribe_url_params:d.params},b.title,location.href),c(a).on("popstate",function(a){var b=a.originalEvent.state;b&&!m.length&&(g.do_string=!1,g.pushstate=!1,g.popping=!0,g.params=b.tribe_params,g.url_params=b.tribe_url_params,f.pre_ajax(function(){k()}),f.set_form(g.params))})}c("#tribe-events-content-wrapper").on("click",'ul.tribe-events-sub-nav a[rel="next"]',function(a){if(a.preventDefault(),!g.ajax_running){var b=c(this).attr("href"),e=/tribe_event_display=([^&]+)/gi,h=e.exec(b);c(this).parent().is(".tribe-events-past")?g.view="past":"undefined"!==h[1]?g.view=h[1]:g.view="list",d.cur_url=f.url_path(b),e=/tribe_paged=([^&]+)/gi,h=e.exec(b),"undefined"!=typeof h[1]?g.paged=h[1]:"list"===g.view?g.paged?g.paged++:g.paged=2:g.paged?g.paged--:(g.view="list",g.paged=1),g.popping=!1,f.pre_ajax(function(){k()})}}).on("click",'ul.tribe-events-sub-nav a[rel="prev"]',function(a){if(a.preventDefault(),!g.ajax_running){var b=c(this).attr("href"),e=/tribe_event_display=([^&]+)/gi,h=e.exec(b);c(this).parent().is(".tribe-events-past")?g.view="past":"undefined"!=typeof h[1]?g.view=h[1]:g.view="list",e=/tribe_paged=([^&]+)/gi,h=e.exec(b),d.cur_url=f.url_path(c(this).attr("href")),"undefined"!=typeof h[1]?g.paged=h[1]:"list"===g.view?g.paged>1?g.paged--:(g.paged=1,g.view="past"):g.paged++,g.popping=!1,f.pre_ajax(function(){k()})}}),f.snap("#tribe-events-content-wrapper","#tribe-events-content-wrapper","#tribe-events-footer .tribe-events-nav-previous a, #tribe-events-footer .tribe-events-nav-next a"),(h.no_bar()||h.live_ajax()&&h.pushstate)&&c("#tribe-events-bar").on("changeDate","#tribe-bar-date",function(a){h.reset_on()||(g.popping=!1,j(a))}),c("form#tribe-bar-form").on("submit",function(a){g.popping=!1,j(a)}),c(e).on("tribe_ev_runAjax",function(){k()})})}(window,document,jQuery,tribe_ev.data,tribe_ev.events,tribe_ev.fn,tribe_ev.state,tribe_ev.tests,tribe_js_config,tribe_debug);
the-events-calendar.php CHANGED
@@ -2,7 +2,7 @@
2
  /*
3
  Plugin Name: The Events Calendar
4
  Description: The Events Calendar is a carefully crafted, extensible plugin that lets you easily share your events. Beautiful. Solid. Awesome.
5
- Version: 3.11.1
6
  Author: Modern Tribe, Inc.
7
  Author URI: http://m.tri.be/1x
8
  Text Domain: tribe-events-calendar
2
  /*
3
  Plugin Name: The Events Calendar
4
  Description: The Events Calendar is a carefully crafted, extensible plugin that lets you easily share your events. Beautiful. Solid. Awesome.
5
+ Version: 3.11.2
6
  Author: Modern Tribe, Inc.
7
  Author URI: http://m.tri.be/1x
8
  Text Domain: tribe-events-calendar