Changeset 1320534
- Timestamp:
- 01/04/2016 02:00:15 AM (10 years ago)
- Location:
- ajax-load-more/trunk
- Files:
-
- 5 edited
-
README.txt (modified) (2 diffs)
-
ajax-load-more.php (modified) (11 diffs)
-
core/css/ajax-load-more.css (modified) (1 diff)
-
core/js/ajax-load-more.js (modified) (2 diffs)
-
core/js/ajax-load-more.min.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ajax-load-more/trunk/README.txt
r1315285 r1320534 2 2 Contributors: dcooney 3 3 Donate link: http://connekthq.com/donate/ 4 Tags: infinite scroll, scroll, lazy load, lazy loading, pagination, ajax pagination, ajax, ajax posts, ajax load posts, loop, query, shortcode builder, wp_query, search, tags, category, post types, comments, taxonomy, meta_query, archives, date, endless, endless scroll4 Tags: infinite scroll, scroll, infinite, lazy load, lazy loading, pagination, ajax pagination, ajax, ajax posts, ajax load posts, loop, query, dynamic, shortcode builder, wp_query, search, tags, category, post types, taxonomy, meta_query, archives, date, infinite scrolling 5 5 Requires at least: 3.6 6 6 Tested up to: 4.4 7 Stable tag: 2.8. 57 Stable tag: 2.8.6 8 8 License: GPLv2 or later 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 314 314 == Changelog == 315 315 316 = 2.8.6 = 317 * NEW - Adding a set of filter hooks to enable users to hook into Ajax Load More to insert or modify data. See https://connekthq.com/plugins/ajax-load-more/docs/filter-hooks/ for more information. 318 * FIX - Updated infinite scrolling css styling. 319 316 320 317 321 = 2.8.5 = -
ajax-load-more/trunk/ajax-load-more.php
r1314545 r1320534 8 8 Twitter: @KaptonKaos 9 9 Author URI: http://connekthq.com 10 Version: 2.8. 510 Version: 2.8.6 11 11 License: GPL 12 12 Copyright: Darren Cooney & Connekt Media … … 14 14 15 15 16 define('ALM_VERSION', '2.8. 5');17 define('ALM_RELEASE', ' December 22, 2015');16 define('ALM_VERSION', '2.8.6'); 17 define('ALM_RELEASE', 'January 3, 2016'); 18 18 define('ALM_STORE_URL', 'https://connekthq.com'); 19 19 … … 28 28 29 29 if (!defined('ALM_PAGING_ITEM_NAME')) 30 define('ALM_PAGING_ITEM_NAME', '6898' );30 define('ALM_PAGING_ITEM_NAME', '6898' ); 31 31 32 32 if (!defined('ALM_PRELOADED_ITEM_NAME')) … … 260 260 function alm_shortcode( $atts, $content = null ) { 261 261 262 $options = get_option( 'alm_settings' ); // Get Ajax Load More Settingss 262 global $post; 263 $options = get_option( 'alm_settings' ); // Get Ajax Load More Settings 264 $slug = $post->post_name; // Current page slug 263 265 264 266 extract(shortcode_atts(array( … … 411 413 $ajaxloadmore = ''; 412 414 413 // ALM Filter (alm_before_container) 414 $ajaxloadmore .= apply_filters('alm_before_container', ''); 415 416 $ajaxloadmore .= '<div id="ajax-load-more" class="ajax-load-more-wrap '. $btn_color .''. $paging_color .'" data-id="" data-canonical-url="'.get_permalink().'">'; 415 $ajaxloadmore .= apply_filters('alm_before_container', ''); // ALM Core Filter Hook 416 417 $ajaxloadmore .= '<div id="ajax-load-more" class="ajax-load-more-wrap '. $btn_color .''. $paging_color .'" data-id="" data-canonical-url="'.get_permalink().'" data-slug="'. $post->post_name .'">'; 417 418 418 419 … … 495 496 $preloaded_type = $preloaded_type[0]; // (default | repeater | template_) 496 497 497 // Create $args array and store it in $preloaded_arg_array498 $args = apply_filters('alm_ preload_args', $preloaded_arr);498 $args = apply_filters('alm_preload_args', $preloaded_arr); // Create preloaded $args 499 $args = apply_filters('alm_modify_query_args', $args, $slug); // ALM Core Filter Hook 499 500 500 501 $alm_preload_query = new WP_Query($args); … … 598 599 // SEO Add-on 599 600 if(has_action('alm_seo_installed') && $seo === 'true'){ 600 $seo_return = apply_filters('alm_seo_shortcode', $seo, $preloaded, $options); 601 $seo_return = apply_filters( 602 'alm_seo_shortcode', 603 $seo, 604 $preloaded, 605 $options 606 ); 601 607 $ajaxloadmore .= $seo_return; 602 608 } … … 685 691 686 692 $ajaxloadmore .= '</'.$container_element.'>'; 687 688 // ALM Filter (alm_before_button) 689 $ajaxloadmore .= apply_filters('alm_before_button', ''); 693 694 $ajaxloadmore .= apply_filters('alm_before_button', ''); // ALM Core Filter Hook 690 695 691 696 $ajaxloadmore .= '</div>'; 692 697 693 694 // ALM Filter (alm_after_container) 695 $ajaxloadmore .= apply_filters('alm_after_container', ''); 696 697 // End ALM object 698 return $ajaxloadmore; 698 $ajaxloadmore .= apply_filters('alm_after_container', ''); // ALM Core Filter Hook 699 700 return $ajaxloadmore; // End ALM object 699 701 } 700 702 … … 709 711 710 712 function alm_query_posts() { 711 713 712 714 $nonce = $_GET['nonce']; 713 715 $options = get_option( 'alm_settings' ); … … 721 723 } 722 724 725 $slug = (isset($_GET['slug'])) ? $_GET['slug'] : ''; 723 726 724 727 $queryType = (isset($_GET['query_type'])) ? $_GET['query_type'] : 'standard'; // 'standard' or 'totalposts'; totalposts returns $alm_found_posts … … 1010 1013 } 1011 1014 1012 1015 $args = apply_filters('alm_modify_query_args', $args, $slug); // ALM Core Filter Hook 1016 1013 1017 // WP_Query() 1014 1018 $alm_query = new WP_Query( $args ); -
ajax-load-more/trunk/core/css/ajax-load-more.css
r1300756 r1320534 170 170 width: 100%; 171 171 background-color: transparent !important; 172 -webkit-box-shadow: none !important; 173 -moz-box-shadow: none !important; 174 -o-box-shadow: none !important; 175 -ms-box-shadow: none !important; 176 box-shadow: none !important; 172 177 overflow: hidden; 173 178 text-indent: -9999px; 174 179 cursor: default !important; 180 outline: none !important; 175 181 } 176 182 .ajax-load-more-wrap.infinite button.alm-load-more-btn:before { -
ajax-load-more/trunk/core/js/ajax-load-more.js
r1314545 r1320534 41 41 alm.content_preloaded = $('.alm-listing.alm-preloaded', alm.container); 42 42 alm.canonical_url = alm.el.attr('data-canonical-url'); 43 alm.slug = alm.el.attr('data-slug'); 43 44 alm.prefix = 'alm-'; 44 45 alm.cache = alm.content.attr('data-cache'); // cache (true/false) … … 448 449 previous_post_id: alm.previous_post_id, 449 450 previous_post_taxonomy: alm.previous_post_taxonomy, 450 lang: alm.lang 451 lang: alm.lang, 452 slug: alm.slug, 451 453 }, 452 454 dataType: "html", -
ajax-load-more/trunk/core/js/ajax-load-more.min.js
r1314545 r1320534 12 12 */ 13 13 14 14 15 (function($){"use strict";$.ajaxloadmore=function(el,e){if(alm_localize.scrolltop==='true'){$(window).scrollTop(0);} 15 var alm=this;alm.AjaxLoadMore={};alm.page=0;alm.speed=250;alm.proceed=false;alm.disable_ajax=false;alm.init=true;alm.loading=true;alm.finished=false;alm.window=$(window);alm.button_label='';alm.data;alm.el=el;alm.container=el;alm.container.addClass('alm-'+e).attr('data-id',e);alm.content=$('.alm-ajax',alm.container);alm.content_preloaded=$('.alm-listing.alm-preloaded',alm.container);alm.canonical_url=alm.el.attr('data-canonical-url');alm. prefix='alm-';alm.cache=alm.content.attr('data-cache');alm.cache_id=alm.content.attr('data-cache-id');alm.cache_path=alm.content.attr('data-cache-path');alm.cache_logged_in=alm.content.attr('data-cache-logged-in');alm.repeater=alm.content.attr('data-repeater');alm.theme_repeater=alm.content.attr('data-theme-repeater');alm.scroll_distance=parseInt(alm.content.attr('data-scroll-distance'));alm.max_pages=parseInt(alm.content.attr('data-max-pages'));alm.pause_override=alm.content.attr('data-pause-override');alm.pause=alm.content.attr('data-pause');alm.transition=alm.content.attr('data-transition');alm.images_loaded=alm.content.attr('data-images-loaded');alm.destroy_after=alm.content.attr('data-destroy-after');alm.lang=alm.content.attr('data-lang');alm.orginal_posts_per_page=alm.content.attr('data-posts-per-page');alm.posts_per_page=alm.content.attr('data-posts-per-page');alm.previous_post=alm.content.attr('data-previous-post');alm.previous_post_id=alm.content.attr('data-previous-post-id');alm.previous_post_taxonomy=alm.content.attr('data-previous-post-taxonomy');alm.comments=alm.content.attr('data-comments');if(alm.comments==='true'){alm.content=$('.alm-comments',alm.container);}16 var alm=this;alm.AjaxLoadMore={};alm.page=0;alm.speed=250;alm.proceed=false;alm.disable_ajax=false;alm.init=true;alm.loading=true;alm.finished=false;alm.window=$(window);alm.button_label='';alm.data;alm.el=el;alm.container=el;alm.container.addClass('alm-'+e).attr('data-id',e);alm.content=$('.alm-ajax',alm.container);alm.content_preloaded=$('.alm-listing.alm-preloaded',alm.container);alm.canonical_url=alm.el.attr('data-canonical-url');alm.slug=alm.el.attr('data-slug');alm.prefix='alm-';alm.cache=alm.content.attr('data-cache');alm.cache_id=alm.content.attr('data-cache-id');alm.cache_path=alm.content.attr('data-cache-path');alm.cache_logged_in=alm.content.attr('data-cache-logged-in');alm.repeater=alm.content.attr('data-repeater');alm.theme_repeater=alm.content.attr('data-theme-repeater');alm.scroll_distance=parseInt(alm.content.attr('data-scroll-distance'));alm.max_pages=parseInt(alm.content.attr('data-max-pages'));alm.pause_override=alm.content.attr('data-pause-override');alm.pause=alm.content.attr('data-pause');alm.transition=alm.content.attr('data-transition');alm.images_loaded=alm.content.attr('data-images-loaded');alm.destroy_after=alm.content.attr('data-destroy-after');alm.lang=alm.content.attr('data-lang');alm.orginal_posts_per_page=alm.content.attr('data-posts-per-page');alm.posts_per_page=alm.content.attr('data-posts-per-page');alm.previous_post=alm.content.attr('data-previous-post');alm.previous_post_id=alm.content.attr('data-previous-post-id');alm.previous_post_taxonomy=alm.content.attr('data-previous-post-taxonomy');alm.comments=alm.content.attr('data-comments');if(alm.comments==='true'){alm.content=$('.alm-comments',alm.container);} 16 17 alm.comments_array='';alm.comments_post_id=alm.content.attr('data-comments_post_id');alm.comments_per_page=alm.content.attr('data-comments_per_page');alm.comments_type=alm.content.attr('data-comments_type');alm.comments_style=alm.content.attr('data-comments_style');alm.comments_template=alm.content.attr('data-comments_template');alm.comments_callback=alm.content.attr('data-comments_callback');alm.seo=alm.content.attr('data-seo');alm.preloaded=alm.content.attr('data-preloaded');alm.preloaded_amount=alm.content.attr('data-preloaded-amount');alm.paging=alm.content.attr('data-paging');alm.paging_controls=alm.content.attr('data-paging-controls');alm.paging_show_at_most=alm.content.attr('data-paging-show-at-most');alm.paging_classes=alm.content.attr('data-paging-classes');if(alm.paging==='true'){alm.paging=true;if(alm.paging_show_at_most===undefined){alm.paging_show_at_most=7;} 17 18 if(alm.preloaded==='true'){alm.pause=true;}}else{alm.paging=false;} … … 48 49 alm.loading=true;if(alm.cache==='true'&&!alm.cache_logged_in){if(alm.init&&alm.seo&&alm.isPaged){alm.AjaxLoadMore.ajax('standard');}else{var cachePage=alm.cache_path+'/page-'+alm.page+'.html';$.get(cachePage,function(data){alm.AjaxLoadMore.success(data);}).fail(function(){alm.AjaxLoadMore.ajax('standard');});}}else{alm.AjaxLoadMore.ajax('standard');}}};alm.AjaxLoadMore.ajax=function(queryType){if(alm.previous_post){alm.previous_post_id=alm.content.attr('data-previous-post-id');alm.previous_post_taxonomy=alm.content.attr('data-previous-post-taxonomy');} 49 50 var action='alm_query_posts';if(alm.comments==='true'){action='alm_comments_query';alm.posts_per_page=alm.comments_per_page;alm.comments_array={'comments':'true','post_id':alm.comments_post_id,'per_page':alm.comments_per_page,'type':alm.comments_type,'style':alm.comments_style,'template':alm.comments_template,'callback':alm.comments_callback,};} 50 $.ajax({type:"GET",url:alm_localize.ajaxurl,data:{action:action,query_type:queryType,nonce:alm_localize.alm_nonce,cache_id:alm.cache_id,repeater:alm.repeater,theme_repeater:alm.theme_repeater,comments:alm.comments_array,post_type:alm.post_type,post_format:alm.content.attr('data-post-format'),category:alm.content.attr('data-category'),category__not_in:alm.content.attr('data-category-not-in'),tag:alm.content.attr('data-tag'),tag__not_in:alm.content.attr('data-tag-not-in'),taxonomy:alm.content.attr('data-taxonomy'),taxonomy_terms:alm.content.attr('data-taxonomy-terms'),taxonomy_operator:alm.content.attr('data-taxonomy-operator'),taxonomy_relation:alm.content.attr('data-taxonomy-relation'),meta_key:alm.content.attr('data-meta-key'),meta_value:alm.content.attr('data-meta-value'),meta_compare:alm.content.attr('data-meta-compare'),meta_relation:alm.content.attr('data-meta-relation'),meta_type:alm.content.attr('data-meta-type'),author:alm.content.attr('data-author'),year:alm.content.attr('data-year'),month:alm.content.attr('data-month'),day:alm.content.attr('data-day'),post_status:alm.content.attr('data-post-status'),order:alm.content.attr('data-order'),orderby:alm.content.attr('data-orderby'),post__in:alm.content.attr('data-post-in'),post__not_in:alm.content.attr('data-post-not-in'),exclude:alm.content.attr('data-exclude'),search:alm.content.attr('data-search'),custom_args:alm.content.attr('data-custom-args'),posts_per_page:alm.posts_per_page,pageNumber:alm.page,offset:alm.offset,preloaded:alm.preloaded,preloaded_amount:alm.preloaded_amount,seo_start_page:alm.start_page,previous_post:alm.previous_post,previous_post_id:alm.previous_post_id,previous_post_taxonomy:alm.previous_post_taxonomy,lang:alm.lang },dataType:"html",beforeSend:function(){if(alm.page!=1&&!alm.paging){alm.button.addClass('loading');}},success:function(data){if(queryType==='standard'){alm.AjaxLoadMore.success(data);}51 $.ajax({type:"GET",url:alm_localize.ajaxurl,data:{action:action,query_type:queryType,nonce:alm_localize.alm_nonce,cache_id:alm.cache_id,repeater:alm.repeater,theme_repeater:alm.theme_repeater,comments:alm.comments_array,post_type:alm.post_type,post_format:alm.content.attr('data-post-format'),category:alm.content.attr('data-category'),category__not_in:alm.content.attr('data-category-not-in'),tag:alm.content.attr('data-tag'),tag__not_in:alm.content.attr('data-tag-not-in'),taxonomy:alm.content.attr('data-taxonomy'),taxonomy_terms:alm.content.attr('data-taxonomy-terms'),taxonomy_operator:alm.content.attr('data-taxonomy-operator'),taxonomy_relation:alm.content.attr('data-taxonomy-relation'),meta_key:alm.content.attr('data-meta-key'),meta_value:alm.content.attr('data-meta-value'),meta_compare:alm.content.attr('data-meta-compare'),meta_relation:alm.content.attr('data-meta-relation'),meta_type:alm.content.attr('data-meta-type'),author:alm.content.attr('data-author'),year:alm.content.attr('data-year'),month:alm.content.attr('data-month'),day:alm.content.attr('data-day'),post_status:alm.content.attr('data-post-status'),order:alm.content.attr('data-order'),orderby:alm.content.attr('data-orderby'),post__in:alm.content.attr('data-post-in'),post__not_in:alm.content.attr('data-post-not-in'),exclude:alm.content.attr('data-exclude'),search:alm.content.attr('data-search'),custom_args:alm.content.attr('data-custom-args'),posts_per_page:alm.posts_per_page,pageNumber:alm.page,offset:alm.offset,preloaded:alm.preloaded,preloaded_amount:alm.preloaded_amount,seo_start_page:alm.start_page,previous_post:alm.previous_post,previous_post_id:alm.previous_post_id,previous_post_taxonomy:alm.previous_post_taxonomy,lang:alm.lang,slug:alm.slug,},dataType:"html",beforeSend:function(){if(alm.page!=1&&!alm.paging){alm.button.addClass('loading');}},success:function(data){if(queryType==='standard'){alm.AjaxLoadMore.success(data);} 51 52 else if(queryType==='totalposts'&&alm.paging){if($.isFunction($.fn.almBuildPagination)){$.fn.almBuildPagination(data,alm);}}},error:function(jqXHR,textStatus,errorThrown){alm.AjaxLoadMore.error(jqXHR,textStatus,errorThrown);}});};if(alm.paging){alm.AjaxLoadMore.ajax('totalposts');} 52 53 alm.AjaxLoadMore.success=function(data){if(alm.previous_post){alm.AjaxLoadMore.getPreviousPost();}
Note: See TracChangeset
for help on using the changeset viewer.