Merge pull request #145 from fieg/trigger-prev-html

added `htmlPrev` and `textPrev` options to IASTriggerExtension

Author: fieg

.travis.yml

@@ -17,7 +17,7 @@ script:
 language: node_js
 
 node_js:
-  - 0.8
+  - 0.10
 
 env:
   - JQUERY_VERSION=1.7.*

CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+## 2.1.2
+
+* Added `htmlPrev` and `textPrev` options to IASTriggerExtension
+
 ## 2.1.1
 
 * Changed argument of `load` event from url to event object

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery-ias",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "homepage": "http://infiniteajaxscroll.com",
   "main": "src/jquery-ias.js",
   "ignore": [

ias.jquery.json

@@ -2,7 +2,7 @@
   "name": "ias",
   "title": "Infinite Ajax Scroll",
   "description": "jQuery plugin that progressively enhances your server-side pagination",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "homepage": "http://infiniteajaxscroll.com",
   "download": "http://infiniteajaxscroll.com/download.html",
   "docs": "http://infiniteajaxscroll.com/docs/getting-started.html",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "jquery-ias",
   "title": "Infinite Ajax Scroll",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "A jQuery plugin that turns your server-side pagination into an infinite scrolling one using AJAX",
   "homepage": "http://infiniteajaxscroll.com",
   "main": "src/jquery-ias.js",

src/extension/trigger.js

@@ -13,6 +13,7 @@ var IASTriggerExtension = function(options) {
 
   this.ias = null;
   this.html = (options.html).replace('{text}', options.text);
+  this.htmlPrev = (options.htmlPrev).replace('{text}', options.textPrev);
   this.enabled = true;
   this.count = 0;
   this.offset = options.offset;
@@ -31,7 +32,7 @@ var IASTriggerExtension = function(options) {
       return true;
     }
 
-    var $trigger = this.$triggerNext || (this.$triggerNext = this.createTrigger(this.next));
+    var $trigger = this.$triggerNext || (this.$triggerNext = this.createTrigger(this.next, this.html));
     var $lastItem = this.ias.getLastItem();
 
     $lastItem.after($trigger);
@@ -48,7 +49,7 @@ var IASTriggerExtension = function(options) {
       return true;
     }
 
-    var $trigger = this.$triggerPrev || (this.$triggerPrev = this.createTrigger(this.prev));
+    var $trigger = this.$triggerPrev || (this.$triggerPrev = this.createTrigger(this.prev, this.htmlPrev));
     var $firstItem = this.ias.getFirstItem();
 
     $firstItem.before($trigger);
@@ -60,10 +61,14 @@ var IASTriggerExtension = function(options) {
   /**
    * @param clickCallback
    * @returns {*|jQuery}
+   * @param {string} html
    */
-  this.createTrigger = function(clickCallback) {
+  this.createTrigger = function(clickCallback, html) {
     var uid = (new Date()).getTime(),
-        $trigger = $(this.html).attr('id', 'ias_trigger_' + uid);
+        $trigger;
+
+    html = html || this.html;
+    $trigger = $(html).attr('id', 'ias_trigger_' + uid);
 
     $trigger.hide();
     $trigger.on('click', $.proxy(clickCallback, this));
@@ -126,7 +131,9 @@ IASTriggerExtension.prototype.prev = function() {
  */
 IASTriggerExtension.prototype.defaults = {
   text: 'Load more items',
-  html: '<div class="ias-trigger" style="text-align: center; cursor: pointer;"><a>{text}</a></div>',
+  html: '<div class="ias-trigger ias-trigger-next" style="text-align: center; cursor: pointer;"><a>{text}</a></div>',
+  textPrev: 'Load previous items',
+  htmlPrev: '<div class="ias-trigger ias-trigger-prev" style="text-align: center; cursor: pointer;"><a>{text}</a></div>',
   offset: 0
 };
 

src/jquery-ias.js

@@ -1,5 +1,5 @@
 /**
- * Infinite Ajax Scroll v2.1.1
+ * Infinite Ajax Scroll v2.1.2
  * A jQuery plugin for infinite scrolling
  * http://infiniteajaxscroll.com
  *

test/04-trigger-extension-test.js

@@ -11,7 +11,7 @@ describe("IAS", function () {
       item: '.post',
       pagination: '.navigation',
       next: '.next-posts a'
-    })
+    });
   });
 
   after(function() {
@@ -115,4 +115,41 @@ describe("IAS", function () {
 
     return deferred.promise;
   });
+
+  it("should display a prev trigger", function() {
+    var deferred = when.defer();
+
+    jQuery.ias('destroy');
+
+    loadFixture("page2.html", function() {
+      jQuery.ias({
+        container : '.listing',
+        item: '.post',
+        pagination: '.navigation',
+        next: '.next-posts a'
+      });
+
+      jQuery.ias().extension(new IASPagingExtension());
+      jQuery.ias().extension(new IASTriggerExtension({
+        textPrev: 'trigger prev text'
+      }));
+      jQuery.ias().extension(new IASHistoryExtension({
+        prev: '.prev-posts a'
+      }));
+
+      expect($('.ias-trigger-prev:visible').length).toEqual(0); // ensure it isn't already there
+
+      jQuery.ias().initialize();
+
+      wait(1000).then(function() {
+        expect($('.ias-trigger-prev:visible').length).toEqual(1);
+
+        expect($('.ias-trigger-prev:visible').text()).toEqual('trigger prev text');
+
+        deferred.resolve();
+      })
+    });
+
+    return deferred.promise;
+  });
 });