Merge pull request ByScripts#3 from Webastronaut/master

Optimized loading script and added error message

Author: ByScripts

byscripts_ajax_posts_loader.php

@@ -78,6 +78,7 @@ public function start() {
 				'page_link_model' => get_pagenum_link(9999999999),
 				'load_more_str' => __('Load more news', $this->identifier),
 				'loading_str' => __('Loading...', $this->identifier),
+				'error_str' => __('An error occured. Could not load more posts.', $this->identifier),
 				'no_more_str' => __('No more news to load', $this->identifier),
 				'content_css_selector' => get_option($this->prefix('content_css_selector'), '#content'),
 				'pagination_css_selector' => get_option($this->prefix('pagination_css_selector'), '.pagination'),
@@ -132,4 +133,4 @@ public function settingsLink($links) {
 	}
 }
 
-new ByScriptsAjaxPostsLoader();
+new ByScriptsAjaxPostsLoader();

js/byscripts_ajax_posts_loader.js

@@ -1,63 +1,60 @@
 jQuery(document).ready(function($) {
 
-	// The number of the next page to load (/page/x/).
-	var page_number_next = parseInt(byscripts_ajax_posts_loader.page_number_next);
-	
-	// The maximum number of pages the current query can return.
-	var page_number_max = parseInt(byscripts_ajax_posts_loader.page_number_max);
-	
-	// The link of the next page of posts.
-	var page_link_model = byscripts_ajax_posts_loader.page_link_model;
+	var page_number_next = parseInt(byscripts_ajax_posts_loader.page_number_next), // The number of the next page to load (/page/x/).
+		page_number_max = parseInt(byscripts_ajax_posts_loader.page_number_max), // The maximum number of pages the current query can return.
+		page_link_model = byscripts_ajax_posts_loader.page_link_model, // The link of the next page of posts.
+		$content = $(byscripts_ajax_posts_loader.content_css_selector), // The content Element posts are inserted to
+		$pagination = $(byscripts_ajax_posts_loader.pagination_css_selector), // The wordpress default pagination
+		$loaderTrigger;
 
 	/**
 	 * Replace the traditional navigation with our own,
 	 * but only if there is at least one page of new posts to load.
 	 */
 	if(page_number_next <= page_number_max) {
 		// Insert the "More Posts" link.
-		$(byscripts_ajax_posts_loader.content_css_selector)
-			.append('<div id="byscripts_ajax_posts_loader_placeholder_'+ page_number_next +'"></div>')
-			.append('<div id="byscripts_ajax_posts_loader_trigger">{loadmore}</div>'.replace('{loadmore}', byscripts_ajax_posts_loader.load_more_str));
+		$content.append('<div id="byscripts_ajax_posts_loader_trigger">{loadmore}</div>'.replace('{loadmore}', byscripts_ajax_posts_loader.load_more_str));
+		$loaderTrigger = $('#byscripts_ajax_posts_loader_trigger');
 
 		// Remove the traditional navigation.
-		$(byscripts_ajax_posts_loader.pagination_css_selector).remove();
+		$pagination.remove();
 	}
 
 
 	/**
 	 * Load new posts when the link is clicked.
 	 */
-	$('#byscripts_ajax_posts_loader_trigger').click(function() {
-	
+	$loaderTrigger.click(function() {
+		var next_link = page_link_model.replace(/\d+$/, page_number_next);
+
 		// Are there more posts to load?
 		if(page_number_next <= page_number_max) {
-		
+
 			// Show that we're working.
 			$(this).text(byscripts_ajax_posts_loader.loading_str);
 
-			var next_link = page_link_model.replace(/9999999999/, page_number_next);
-
-			$('#byscripts_ajax_posts_loader_placeholder_'+ page_number_next).load(next_link + ' .post',
-				function() {
-					// Update page number and next_link.
-					page_number_next++;
-					
-					// Add a new placeholder, for when user clicks again.
-					$('#byscripts_ajax_posts_loader_trigger')
-						.before('<div id="byscripts_ajax_posts_loader_placeholder_'+ page_number_next +'"></div>')
-					
-					// Update the button message.
-					if(page_number_next <= page_number_max) {
-						$('#byscripts_ajax_posts_loader_trigger').text(byscripts_ajax_posts_loader.load_more_str);
-					} else if(byscripts_ajax_posts_loader.remove_link_after_last_result) {
-						$('#byscripts_ajax_posts_loader_trigger').remove();
-					} else {
-						$('#byscripts_ajax_posts_loader_trigger').text(byscripts_ajax_posts_loader.no_more_str);
-					}
+			// Load more posts
+			$.ajax({
+				type : 'POST',
+				url : next_link
+			}).done(function(data) {
+				page_number_next++;
+
+				$loaderTrigger.before($(data).find(byscripts_ajax_posts_loader.content_css_selector).remove(byscripts_ajax_posts_loader.pagination_css_selector).html());
+				$(byscripts_ajax_posts_loader.pagination_css_selector).remove();
+
+				if(page_number_next <= page_number_max) {
+					$loaderTrigger.text(byscripts_ajax_posts_loader.load_more_str);
+				} else if(byscripts_ajax_posts_loader.remove_link_after_last_result) {
+					$loaderTrigger.remove();
+				} else {
+					$loaderTrigger.text(byscripts_ajax_posts_loader.no_more_str);
 				}
-			);
+			}).fail(function() {
+				$loaderTrigger.text(byscripts_ajax_posts_loader.error_str);
+			});
 		}
 
 		return false;
 	});
-});
+});