Get WordPress

Plugin Directory

Changeset 688912

Timestamp:
03/29/2013 05:38:59 PM (11 years ago)
Author:
stephenh1988
Message:

Committing 1.8.4

Location:
event-organiser/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • event-organiser/trunk/event-organiser.php

    r688029 r688912  
    33Plugin Name: Event Organiser
    44Plugin URI: http://www.wp-event-organiser.com
    5 Version: 1.8.3
     5Version: 1.8.
    66Description: Creates a custom post type 'events' with features such as reoccurring events, venues, Google Maps, calendar views and events and venue pages
    77Author: Stephen Harris
    … …  
    4242 */
    4343global $eventorganiser_db_version;
    44 $eventorganiser_db_version = '1.8.3';
     44$eventorganiser_db_version = '1.8.';
    4545
    4646

  • event-organiser/trunk/includes/event-organiser-event-functions.php

    r688029 r688912  
    4141*        foreach ($events as $event):
    4242*                //Check if all day, set format accordingly
    43 *                $format = ( eo_is_all_day($event->ID) ? get_option('date_format') ? get_option('date_format').' '.get_option('time_format') );
     43*                $format = ( eo_is_all_day($event->ID) ? get_option('date_format') get_option('date_format').' '.get_option('time_format') );
    4444*                printf('<li><a href="%s"> %s </a> on %s </li>',
    4545*                                   get_permalink($event->ID),

  • event-organiser/trunk/includes/event-organiser-register.php

    r688029 r688912  
    1010function eventorganiser_register_script() {
    1111    global $wp_locale;
    12     $version = '1.8.3';
     12    $version = '1.8.';
    1313
    1414    $ext = (defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG) ? '' : '.min';
    … …  
    7777 */
    7878function eventorganiser_register_scripts(){
    79     $version = '1.8.3';
     79    $version = '1.8.';
    8080    $ext = (defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG) ? '' : '.min';
    8181

  • event-organiser/trunk/includes/event.php

    r688029 r688912  
    3131*
    3232* @param int $post_id - the event (post) ID for the event you want to update
     33
    3334* @param array $post_data - array of data to be used by wp_update_post.
    34 * @param array $event_data - array of event data
    3535* @return int $post_id - the post ID of the updated event
    3636*/
    … …  
    4949        }
    5050       
    51         $event_data = apply_filters( 'eventorganiser_update_event_event_data', $event_data, $post_id, $post_data );
    52         $post_data = apply_filters( 'eventorganiser_update_event_post_data', $post_data, $post_id, $event_data );
     51        $event_data = apply_filters( 'eventorganiser_update_event_event_data', $event_data, $post_id, $post_data );
     52        $post_data = apply_filters( 'eventorganiser_update_event_post_data', $post_data, $post_id, $event_data );
    5353
    5454        if( !empty($post_data) ){
    … …  
    151151        }
    152152       
    153         $event_data = apply_filters( 'eventorganiser_insert_event_event_data', $event_data, $post_data );
    154         $post_data = apply_filters( 'eventorganiser_insert_event_post_data', $post_data, $event_data );
    155 
    156153        //If schedule is 'once' and dates are included - set to 'custom':
    157154        if( ( empty($event_data['schedule']) || 'once' == $event_data['schedule'] ) && !empty($event_data['include']) ){
    … …  
    160157
    161158        $event_data = _eventorganiser_generate_occurrences($event_data);
    162 
     159       
    163160        if( is_wp_error($event_data) )
    164161            return $event_data;
    165162
     163
     164
     165
    166166        //Finally we create event (first create the post in WP)
    167167        $post_input = array_merge(array('post_title'=>'untitled event'), $post_data, array('post_type'=>'event'));         

  • event-organiser/trunk/js/frontend.js

    r688029 r688912  
    237237
    238238        $(".eo_widget_calendar tfoot").unbind("click");
    239         $(".eo_widget_calendar tfoot a").off("click").on("click", function (a) {
     239        $(".eo_widget_calendar, function (a) {
    240240                    a.preventDefault();
    241241                    var b = $(this).closest(".eo_widget_calendar").attr("id");
    … …  
    361361    var maps = EOAjax.map;
    362362    for (var i = 0; i < maps.length; i++) {
     363
     364
     365
     366
    363367        var locations = maps[i].locations;
    364368        var b = {

  • event-organiser/trunk/js/frontend.min.js

    r688029 r688912  
    99if(typeof h.category!=="undefined"&&h.category!="")b.category=h.category;if(typeof h.venue!=="undefined"&&h.venue!="")b.venue=h.venue;jQuery.ajax({url:EOAjax.ajaxurl+"?action=eventorganiser-fullcal",dataType:"JSON",data:b,success:g})},selectable:false,weekMode:"variable",aspectRatio:1.5,loading:function(b){var d=a("#"+a(this).attr("id")+"_loading");if(b){window.clearTimeout(l);l=window.setTimeout(function(){d.show()},1E3)}else{window.clearTimeout(l);d.hide()}}})}a(".eo-cal-filter").change(function(){a(".eo-fullcalendar").fullCalendar("rerenderEvents")});
    1010a(".eo-mini-calendar").datepicker({dateFormat:"DD, d MM, yy",changeMonth:true,changeYear:true,dateFormat:"DD, d MM, yy",firstDay:parseInt(EOAjax.fullcal.firstDay),buttonText:EOAjaxFront.locale.gotodate,monthNamesShort:EOAjaxFront.locale.monthAbbrev,dayNamesMin:EOAjaxFront.locale.dayAbbrev,showOn:"button",onSelect:function(b){var d=a(this).parents("div.eo-fullcalendar").attr("id");a("#"+d).fullCalendar("gotoDate",new Date(Date.parse(b)))}})}if(a(".eo_widget_calendar").length>0){a(".eo_widget_calendar tfoot").unbind("click");
    11 a(".eo_widget_calendar tfoot a").off("click").on("click",function(b){b.preventDefault();var d=a(this).closest(".eo_widget_calendar").attr("id");b={showpastevents:1};if(typeof EOAjax!=="undefined"&&typeof EOAjax.widget_calendars!=="undefined")b=EOAjax.widget_calendars[d];if(typeof eo_widget_cal!=="undefined")b=eo_widget_cal[d];b.eo_month=eveorg_getParameterByName("eo_month",a(this).attr("href"));a.getJSON(EOAjaxFront.adminajax+"?action=eo_widget_cal",b,function(g){a("#"+d+"_content").html(g)})})}if(a(".eo-agenda-widget").length>
     11a(".eo_widget_calendar",function(b){b.preventDefault();var d=a(this).closest(".eo_widget_calendar").attr("id");b={showpastevents:1};if(typeof EOAjax!=="undefined"&&typeof EOAjax.widget_calendars!=="undefined")b=EOAjax.widget_calendars[d];if(typeof eo_widget_cal!=="undefined")b=eo_widget_cal[d];b.eo_month=eveorg_getParameterByName("eo_month",a(this).attr("href"));a.getJSON(EOAjaxFront.adminajax+"?action=eo_widget_cal",b,function(g){a("#"+d+"_content").html(g)})})}if(a(".eo-agenda-widget").length>
    12120){function o(b,d){a.ajax({url:EOAjaxFront.adminajax,dataType:"JSON",data:{action:"eo_widget_agenda",instance_number:d.number,direction:b,start:d.StartDate,end:d.EndDate},success:function(g){if(!jQuery.isArray(g)||!g[0])return false;else{d.StartDate=g[0].StartDate;d.EndDate=g[g.length-1].StartDate;r(g,d)}}})}function r(b,d){var g=a("#"+d.id+"_container"),h=g.find("ul.dates"),i=h.find("li");a(i).remove();i="";for(c=0;c<b.length;c++){if(i==""||i!=b[c].StartDate&&d.mode=="day"){i=b[c].StartDate;var p=
    1313a('<li class="date" >'+b[c].display+'<ul class="a-date"></ul></li>');h.append(p)}var q=d.add_to_google?a('<li class="event"></li>').append('<span class="cat"></span><span><strong>'+b[c].time+": </strong></span>"+b[c].post_title).append('<div class="meta" style="display:none;"><span>'+b[c].link+"</span><span> \u00a0 </span><span>"+b[c].Glink+"</span></div>"):a('<li class="event"></li>').append("<a class='eo-agenda-event-permalink' href='"+b[c].event_url+"'><span class='cat'></span><span><strong>"+
    1414b[c].time+": </strong></span>"+b[c].post_title+"</a>");q.find("span.cat").css({background:b[c].color});p.append(q)}i=h.find("li");g.find("ul li.event").on("click",function(){a(this).find(".meta").toggle("400")})}for(var m in eo_widget_agenda){m=eo_widget_agenda[m];m.StartDate=a.fullCalendar.formatDate(new Date,"yyyy-MM-dd");m.EndDate=m.StartDate;o(1,m)}a(".eo-agenda-widget .agenda-nav span.button").click(function(b){var d=a(this).parents(".eo-agenda-widget").attr("id");m=eo_widget_agenda[d];b.preventDefault();
    1515b=a(this).hasClass("next")?"+1":a(this).hasClass("prev")?"-1":a(this).parent().hasClass("prev")?"-1":"+1";o(b,m)})}})})(jQuery);function eveorg_getParameterByName(a,f){a=a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");a=(new RegExp("[\\?&]"+a+"=([^&#]*)")).exec(f);return a==null?"":decodeURIComponent(a[1].replace(/\+/g," "))}
    16 function eo_load_map(){for(var a=EOAjax.map,f=0;f<a.length;f++){var j=a[f].locations,k={zoom:a[f].zoom,scrollwheel:a[f].scrollwheel,zoomControl:a[f].zoomcontrol,rotateControl:a[f].rotatecontrol,panControl:a[f].pancontrol,overviewMapControl:a[f].overviewmapcontrol,streetViewControl:a[f].streetviewcontrol,draggable:a[f].draggable,mapTypeControl:a[f].maptypecontrol,mapTypeId:google.maps.MapTypeId[a[f].maptypeid]};k=new google.maps.Map(document.getElementById("eo_venue_map-"+(f+1)),k);for(var e=new google.maps.LatLngBounds,
    17 l=[],c=0;c<j.length;c++){var n=j[c].lat,o=j[c].lng;if(n!==undefined&&o!=undefined){l.push(new google.maps.LatLng(n,o));e.extend(l[c]);n=new google.maps.Marker({position:l[c],map:k,content:j[c].tooltipContent});"false"!=a[f].tooltip&&google.maps.event.addListener(n,"click",eventorganiser_venue_tooltip)}}j.length>1?k.fitBounds(e):k.setCenter(l[0])}}
     16function eo_load_map(){for(var a=EOAjax.map,f=0;f<a.length;f++)
     17l=[],c=0;c<j.length;c++){var n=j[c].lat,o=j[c].lng;if(n!==undefined&&o!=undefined){l.push(new google.maps.LatLng(n,o));e.extend(l[c]);n=new google.maps.Marker({position:l[c],map:k,content:j[c].tooltipContent});"false"!=a[f].tooltip&&google.maps.event.addListener(n,"click",eventorganiser_venue_tooltip)}}j.length>1?k.fitBounds(e):k.setCenter(l[0])}}
    1818function eventorganiser_venue_tooltip(){var a=this.getMap(),f=this.getMap().getProjection().fromLatLngToPoint(this.position),j=a.getProjection().fromLatLngToPoint(a.getBounds().getNorthEast()),k=a.getProjection().fromLatLngToPoint(a.getBounds().getSouthWest());a=Math.pow(2,a.getZoom());f=new google.maps.Point((f.x-k.x)*a,(f.y-j.y)*a);f=[f.x,f.y];if(this.tooltip){this.tooltip.qtip("api").set("position.target",f);this.tooltip.qtip("show")}else{jQuery(this.getMap().getDiv()).css({overflow:"visible"});
    1919this.tooltip=jQuery("<div />").qtip({content:{text:this.content},border:{radius:4,width:3},style:{classes:"ui-tooltip-shadow",widget:true},position:{at:"right center",my:"top center",target:f,container:jQuery(this.getMap().getDiv())},show:{ready:true,event:false,solo:true},hide:{event:"mouseleave unfocus"}})}};

  • event-organiser/trunk/readme.md

    r688029 r688912  
    55**Requires at least:** 3.3 
    66**Tested up to:** 3.5 
    7 **Stable tag:** 1.8.3
     7**Stable tag:** 1.8.
    88**License:** GPLv3 
    99
    … …  
    177177## Changelog ##
    178178
     179
     180
     181
    179182### 1.8.3 ###
    180183* Fixes bugs relating to cross-post-type queries. (see [#65](https://github.com/stephenharris/Event-Organiser/issues/65)

  • event-organiser/trunk/readme.txt

    r688029 r688912  
    55Requires at least: 3.3
    66Tested up to: 3.5
    7 Stable tag: 1.8.3
     7Stable tag: 1.8.
    88License: GPLv3
    99
    … …  
    165165== Changelog ==
    166166
     167
     168
     169
    167170= 1.8.3 =
    168171* Fixes bugs relating to cross-post-type queries. (see [#65](https://github.com/stephenharris/Event-Organiser/issues/65)
Note: See TracChangeset for help on using the changeset viewer.