Merged PRs. Updated README badges and version number references.

README.md

@@ -1,11 +1,14 @@
 # jScroll - jQuery Plugin for Infinite Scrolling / Auto-Paging
 
+[![Build Status](https://travis-ci.org/pklauzinski/jscroll.svg?branch=master)](https://travis-ci.org/pklauzinski/jscroll)
+[![npm version](https://img.shields.io/npm/v/jscroll.svg)](https://www.npmjs.com/package/jscroll)
+[![Bower version](https://img.shields.io/bower/v/jscroll.svg)](https://github.com/pklauzinski/jscroll)
 [![Join the chat at https://gitter.im/pklauzinski/jscroll](https://badges.gitter.im/pklauzinski/jscroll.svg)](https://gitter.im/pklauzinski/jscroll?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Official site at [jscroll.com](http://jscroll.com/).
 
 * Copyright © 2011-2015, [Philip Klauzinski](http://gui.ninja)
-* Current Version: 2.3.4
+* Current Version: 2.3.5
 * Dual licensed under the MIT and GPL Version 2 licenses.
 * http://jscroll.com/#license
 * http://www.opensource.org/licenses/mit-license.php

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jscroll",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "homepage": "http://jscroll.com",
   "authors": [
     {
@@ -20,6 +20,7 @@
     "jscroll",
     "infinite-scroll",
     "infinite-scrolling",
+    "infinite-ajax-scroll",
     "jquery-scrolling",
     "ajax-scrolling",
     "scrolling",

jquery.jscroll.js

@@ -10,7 +10,7 @@
  * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * @author Philip Klauzinski
- * @version 2.3.4
+ * @version 2.3.5
  * @requires jQuery v1.4.3+
  * @preserve
  */
@@ -97,12 +97,12 @@
                         iTopHeight = _isWindow ? _$scroll.scrollTop() : $e.offset().top,
                         innerTop = $inner.length ? $inner.offset().top : 0,
                         iTotalHeight = Math.ceil(iTopHeight - innerTop + _$scroll.height() + iContainerTop);
-    
+
                     if (!data.waiting && iTotalHeight + _options.padding >= $inner.outerHeight()) {
                         //data.nextHref = $.trim(data.nextHref + ' ' + _options.contentSelector);
                         _debug('info', 'jScroll:', $inner.outerHeight() - iTotalHeight, 'from bottom. Loading next request...');
                         return _load();
-                    }   
+                    }
                 }
             },
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jscroll",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "jQuery plugin for infinite scrolling / auto-paging.",
   "main": "jquery.jscroll.js",
   "scripts": {
@@ -31,11 +31,11 @@
   },
   "homepage": "http://jscroll.com",
   "dependencies": {
-    "jQuery": ">=1.4.3"
+    "jquery": "^1.7.4"
   },
   "devDependencies": {
     "grunt": "^0.4.5",
-    "grunt-contrib-jshint": "^0.11.1",
-    "grunt-contrib-uglify": "^0.9.1"
+    "grunt-contrib-jshint": "^0.11.3",
+    "grunt-contrib-uglify": "^0.9.2"
   }
 }