Merge pull request #40 from Codeinwp/development

Fixed Issue with Jetpack Infinite scroll

js/masonry-init.js

@@ -1,15 +1,46 @@
 
 //Masonry init
 jQuery(function($) {
-	var $container = $('.grid-layout');
-	$container.imagesLoaded( function() {
-		$container.masonry({
-			itemSelector: '.hentry',
-	        isAnimated: true,
-			animationOptions: {
-				duration: 300,
-				easing: 'linear',
-			}
-	    });
-	});
+
+    var $container;
+
+    function nsc_trigger_masonry() {
+        // don't proceed if $grid has not been selected
+        if ( !$container ) {
+            return;
+        }
+        // init Masonry
+        $container.imagesLoaded( function() {
+            $container.masonry({
+                itemSelector: '.hentry',
+                isAnimated: true,
+                animationOptions: {
+                    duration: 300,
+                    easing: 'linear',
+                }
+            });
+        });
+    }
+
+    $(window).load(function(){
+        $container = $('.grid-layout'); // this is the grid container
+
+        nsc_trigger_masonry();
+
+        // Triggers re-layout on infinite scroll
+        $( document.body ).on( 'post-load', function () {
+
+            // I removed the infinite_count code
+            var $selector = $('.infinite-wrap');
+            var $elements = $selector.find('.hentry');
+
+            /* here is the idea which is to catch the selector whether it contain element or not, if it's move it to the masonry grid. */
+            if( $selector.children().length > 0 ) {
+                $container.append( $elements ).masonry( 'appended', $elements, true );
+                nsc_trigger_masonry();
+            }
+
+        });
+    });
+
 });

style.css

@@ -4,7 +4,7 @@ Theme URI: http://themeisle.com/themes/oblique
 Author: Themeisle
 Author URI: http://themeisle.com/
 Description: Oblique is a creative masonry theme that works great for fashion or general bloggers. Amongst the features you will find a a parallax header image, full color control with unlimited color variations, easy access to all Google Fonts, responsive design etc.
-Version: 1.12
+Version: 1.13
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: oblique