Merge branch 'master' into master

.travis.yml

@@ -2,4 +2,11 @@ language: node_js
 node_js:
   - "stable"
 before_script:
-  - npm install -g grunt-cli
+  - npm install -g grunt-cli
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/7b6dee6d870a12710299
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: never     # options: [always|never|change] default: always

Gruntfile.js

@@ -29,7 +29,7 @@ module.exports = function(grunt) {
                 }
             },
             files: {
-                src: ['Grunfile.js', 'jquery.jscroll.js']
+                src: ['Gruntfile.js', 'jquery.jscroll.js']
             }
         },
 

README.md

@@ -7,8 +7,8 @@
 
 Official site at [jscroll.com](http://jscroll.com/).
 
-* Copyright © 2011-2015, [Philip Klauzinski](http://gui.ninja)
-* Current Version: 2.3.5
+* Copyright © 2011-2017, [Philip Klauzinski](http://webtopian.com)
+* Current Version: 2.3.7
 * Dual licensed under the MIT and GPL Version 2 licenses.
 * http://jscroll.com/#license
 * http://www.opensource.org/licenses/mit-license.php
@@ -45,7 +45,7 @@ $('.jscroll').jscroll({
 * `autoTrigger (true)` - When set to true, triggers the loading of the next set of content automatically when the user scrolls to the bottom of the containing element. When set to false, the required next link will trigger the loading of the next set of content when clicked.
 * `autoTriggerUntil (false)` - Set to an integer great than 0 to turn off `autoTrigger` of paging after the specified number of pages. Requires `autoTrigger` to be `true`.
 * `loadingHtml ('<small>Loading...</small>')` - The HTML to show at the bottom of the content while loading the next set.
-* `loadingFunction` (false) - A JavaScript function to run after the loadingHtml has been drawn. Makes it possible to fire up a [jspin.js](https://github.com/fgnass/spin.js/) spinner or other effect
+* `loadingFunction` (false) - A JavaScript function to run after the loadingHtml has been drawn.
 * `padding (0)` - The distance from the bottom of the scrollable content at which to trigger the loading of the next set of content. This only applies when autoTrigger is set to true.
 * `nextSelector ('a:last')` - The selector to use for finding the link which contains the href pointing to the next set of content. If this selector is not found, or if it does not contain a href attribute, jScroll will self-destroy and unbind from the element upon which it was called.
 * `contentSelector ('')` - A convenience selector for loading only part of the content in the response for the next set of content. This selector will be ignored if left blank and will apply the entire response to the DOM.

bower.json

@@ -1,13 +1,16 @@
 {
   "name": "jscroll",
-  "version": "2.3.5",
   "homepage": "http://jscroll.com",
   "authors": [
     {
       "name": "Philip Klauzinski",
-      "homepage": "http://gui.ninja"
+      "homepage": "http://webtopian.com"
     }
   ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/pklauzinski/jscroll"
+  },
   "description": "jScroll - jQuery Plugin for Infinite Scrolling / Auto-Paging",
   "main": "jquery.jscroll.js",
   "dependencies": {

jquery.jscroll.js

@@ -1,16 +1,11 @@
 /*!
  * jScroll - jQuery Plugin for Infinite Scrolling / Auto-Paging
- * http://jscroll.com/
+ * @see @link{http://jscroll.com}
  *
- * Copyright 2011-2013, Philip Klauzinski
- * http://klauzinski.com/
- * Dual licensed under the MIT and GPL Version 2 licenses.
- * http://jscroll.com/#license
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * @author Philip Klauzinski
- * @version 2.3.5
+ * @copyright 2011-2017, Philip Klauzinski
+ * @license Dual licensed under the MIT and GPL Version 2 licenses.
+ * @author Philip Klauzinski (http://webtopian.com)
+ * @version 2.3.7
  * @requires jQuery v1.4.3+
  * @preserve
  */
@@ -169,7 +164,8 @@
                     });
 
                 return $e.animate({scrollTop: $inner.outerHeight()}, 0, function() {
-                    $inner.find('div.jscroll-added').last().load(data.nextHref, function(r, status) {
+                    var nextHref = data.nextHref;
+                    $inner.find('div.jscroll-added').last().load(nextHref, function(r, status) {
                         if (status === 'error') {
                             return _destroy();
                         }
@@ -179,7 +175,7 @@
                         $('.jscroll-next-parent', $e).remove(); // Remove the previous next link now that we have a new one
                         _checkNextHref();
                         if (_options.callback) {
-                            _options.callback.call(this);
+                            _options.callback.call(this, nextHref);
                         }
                         _debug('dir', data);
                     });
@@ -232,4 +228,4 @@
         });
     };
 
-})(jQuery);
+})(jQuery);

package.json

@@ -1,10 +1,11 @@
 {
   "name": "jscroll",
-  "version": "2.3.5",
+  "version": "2.3.7",
   "description": "jQuery plugin for infinite scrolling / auto-paging.",
   "main": "jquery.jscroll.js",
   "scripts": {
-    "test": "grunt jshint"
+    "test": "grunt jshint",
+    "build": "grunt uglify"
   },
   "repository": {
     "type": "git",
@@ -23,7 +24,7 @@
   ],
   "author": {
     "name": "Philip Klauzinski",
-    "url": "http://gui.ninja"
+    "url": "http://webtopian.com"
   },
   "license": "MIT",
   "bugs": {
@@ -34,7 +35,7 @@
     "jquery": "^1.7.4"
   },
   "devDependencies": {
-    "grunt": "^0.4.5",
+    "grunt": "^1.0.1",
     "grunt-contrib-jshint": "^0.11.3",
     "grunt-contrib-uglify": "^0.9.2"
   }