Changeset 2293870

Timestamp:

04/28/2020 08:08:25 PM (5 years ago)

Author:

processby

Message:

WP Ajax Load More Pagination update

Location:

wp-ajax-pagination/trunk

Files:

• readme.txt (modified) (3 diffs)
• src/Frontend/Frontend.php (modified) (6 diffs)
• views/admin/section/main-settings.php (modified) (1 diff)
• wp-ajax-pagination.php (modified) (1 diff)

wp-ajax-pagination/trunk/readme.txt

@@ -1 @@
-===WP Ajax Load More Pagination===
+===WP Ajax Load More Pagination and Infinite Scroll===
 Contributors: Processby
 Donate link: https://www.patreon.com/processby
-Tags: load more, ajax load more, ajax pagination, pagination, ajax
+Tags: load more, infinite scroll, ajax pagination, pagination, ajax
 Requires at least: 4.0
 Tested up to: 5.4
-Stable tag: 1.1.1
+Stable tag: 1.1.2
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -21 +21 @@
 * "Load more" button;
 * "Load more" button and pagination;
-* Customisable styles;
+* Infinite Scroll;
+* Customisable styles.
 
 
@@ -37 +38 @@
 == Changelog ==
 
+
+= 1.1.2 =
+
+Release Date: Apr 28, 2020
+
+* Add - Infinite Scroll;
 
 = 1.1.1 =

wp-ajax-pagination/trunk/src/Frontend/Frontend.php

@@ -108 +108 @@
             justify-content: center;  
             margin: 20px 0; 
-       
-        }
-        
+        }   
         .wpap-loadmore-wrapper .wpap-loadmore-button{
             background-color: $button_background;
@@ -129 +127 @@
         ";
 
+        if ($this->options['paginationType'] == 'infinite-scroll') {
+            echo "
+        .wpap-loadmore-wrapper .wpap-loadmore-button{
+           visibility: hidden;
+        }";
+
+        }
+
         if ($enable_loading) {
-
              echo "
             .wp-ajax-pagination-loading{
@@ -158 +163 @@
         $pagingUrl = '';
         if($this->options['pagingUrl']){
-            $pagingUrl = "window.history.pushState('', 'Title', link)";
+            $pagingUrl = "window.history.pushState('', 'Title', link);";
         }
 
@@ -170 +175 @@
             try {return new ActiveXObject(\"Microsoft.XMLHTTP\");}
             catch (error) {}
-        
+            
             throw new Error(\"Could not create HTTP request object.\");
            }";
@@ -181 +186 @@
 
                     if($(\"{$postsSelector}\").length != 0){
-
+                    
                         $(document).on('click', \"{$this->options['navigationSelector'][$i]} a\", function (event) {
                             event.preventDefault();
                               
                             var link = $(this).attr('href');
+                            
                             $('html, body').animate({
-                                scrollTop: $(\"{$postsSelector}\").offset().top
-                            }, 200);                                                                             
+                                scrollTop: ($(\"{$postsSelector}\").offset().top - 200)
+                            }, 200);    
+                                                                                                   
                              $pagingUrl                    
                             $('body').append('<div class=\"wp-ajax-pagination-loading\"></div>');
                 
                             var request = makeHttpObject();
-                
                             request.open(\"POST\", link , true);
                             request.send(null);
@@ -396 +402 @@
         }
 
+
+        if ($this->options['paginationType'] == 'infinite-scroll') {
+
+            global $wp_query;
+            $link = html_entity_decode(get_pagenum_link());
+            $max_pages = $wp_query->max_num_pages;
+            $paged = get_query_var('paged') ? get_query_var('paged') : 1;
+            echo "<script>
+            function makeHttpObject() {
+                try {return new XMLHttpRequest();}
+                catch (error) {}
+                try {return new ActiveXObject(\"Msxml2.XMLHTTP\");}
+                catch (error) {}
+                try {return new ActiveXObject(\"Microsoft.XMLHTTP\");}
+                catch (error) {}
+            
+                throw new Error(\"Could not create HTTP request object.\");
+           }";
+
+            echo "jQuery(document).ready(function($){";
+
+            $i = 0;
+
+            if ($paged != $max_pages) {
+
+                foreach ($this->options['postsSelector'] as $postsSelector) {
+
+                    echo "
+        
+        
+                    if($(\"{$postsSelector}\").length != 0){
+                    $(\"{$this->options['navigationSelector'][$i]}\").before(\"<div class='wpap-loadmore-wrapper'><span class='wpap-loadmore-button loadmore-button-{$i} wpap_button_text' data-pages='$max_pages' data-page='$paged' data-link='$link'>Load more</span></div>\");
+                    $(\"{$this->options['navigationSelector'][$i]}\").remove();
+                    }
+                    var button = $('.loadmore-button-{$i}');
+                    
+                    if(button.length != 0){
+                                      
+                        var pageNext = button.data('page');
+                      
+                        var pages = button.data('pages');
+                        
+                        var isLoading = false;
+                        var endLoading = false;
+                        
+                         if(pageNext < pages){
+                         pageNext++;
+                         }
+                                              
+                         $(window).scroll(function(){
+                         
+                            if( $(document).scrollTop() + $(window).height()  > button.offset().top && button.offset().top > $(document).scrollTop() && !isLoading && !endLoading){
+                                    
+                                var link = button.data('link')+'page/'+pageNext+'/';                                                                             
+                                $pagingUrl  
+                                $('body').append('<div class=\"wp-ajax-pagination-loading\"></div>');
+                                isLoading = true;                       
+
+                                var request = makeHttpObject();
+                    
+                                request.open(\"POST\", link , true);
+                                request.send(null);
+                                request.onreadystatechange = function() {
+                    
+                                    if (request.readyState == 4){
+                                             
+                                        var htmlDoc = $( request.responseText );
+                                        var html = htmlDoc.find('{$postsSelector}').html();
+                                        var htmlNav = htmlDoc.find('{$this->options['navigationSelector'][$i]}').html();
+                    
+                                        $(\"{$postsSelector}\").children().last().after(html);
+                                        
+                                        $('.wp-ajax-pagination-loading').remove();
+                                        isLoading = false;
+                                                                         
+                                         if(pageNext == pages){
+                                           button.remove();
+                                           endLoading = true;
+                                         }else{
+                                          pageNext++;
+                                         }
+                                                                                                                                  
+                                        {$this->options['jsCode']}
+                                    }
+                                }; 
+                                 
+                            }
+                        });
+                            
+                   }";
+                    $i++;
+                }
+
+            }
+            echo '});';
+            echo '</script>';
+        }
+
+
     }
 

wp-ajax-pagination/trunk/views/admin/section/main-settings.php

@@ -45 +45 @@
                 <?php
                 _e('"Load more" button', 'wp-ajax-pagination');
+                ?>
+            </label><br>
+            <label>
+                <input type="radio" name="<?php echo Settings::OPTIONS; ?>[paginationType]" value="infinite-scroll" <?php checked('infinite-scroll', $paginationType); ?>>
+                <?php
+                _e('Infinite Scroll', 'wp-ajax-pagination');
                 ?>
             </label>

wp-ajax-pagination/trunk/wp-ajax-pagination.php

@@ -8 +8 @@
  * Plugin URI:        https://processby.com/ajax-pagination-plugin-wordpress/
  * Description:       Loading paged content with Ajax.
- * Version:           1.1.1
+ * Version:           1.1.2
  * Author:            Processby
  * Author URI:        https://processby.com