Skip to content

Don't show Loading message if next selector is not found during initialization. #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fflewddur wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Don't show Loading message if next selector is not found during initialization. #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e97d44b
Verify that the next selector finds a valid element upon initial load…
fflewddur Feb 2, 2014
8122fdf
Removed extra line
fflewddur Feb 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions jquery.jscroll.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
_$window = $(window),
_$body = $('body'),
_$scroll = _isWindow ? _$window : $e,
_nextHref = $.trim(_$next.attr('href') + ' ' + _options.contentSelector);
_nextHref = _$next.length > 0 ? $.trim(_$next.attr('href') + ' ' + _options.contentSelector) : false;

// Initialization
$e.data('jscroll', $.extend({}, _data, {initialized: true, waiting: false, nextHref: _nextHref}));
Expand Down Expand Up @@ -99,7 +99,7 @@
innerTop = $inner.length ? $inner.offset().top : 0,
iTotalHeight = Math.ceil(iTopHeight - innerTop + _$scroll.height() + iContainerTop);

if (!data.waiting && iTotalHeight + _options.padding >= $inner.outerHeight()) {
if (!data.waiting && iTotalHeight + _options.padding >= $inner.outerHeight() && _checkNextHref()) {
//data.nextHref = $.trim(data.nextHref + ' ' + _options.contentSelector);
_debug('info', 'jScroll:', $inner.outerHeight() - iTotalHeight, 'from bottom. Loading next request...');
return _load();
Expand All @@ -114,6 +114,7 @@
_destroy();
return false;
} else {
_debug('info', 'jScroll: nextHref is "' + data.nextHref + '"');
_setBindings();
return true;
}
Expand Down Expand Up @@ -159,7 +160,7 @@
}
var $next = $(this).find(_options.nextSelector).first();
data.waiting = false;
data.nextHref = $next.attr('href') ? $.trim($next.attr('href') + ' ' + _options.contentSelector) : false;
data.nextHref = ($next.length > 0 && $next.attr('href')) ? $.trim($next.attr('href') + ' ' + _options.contentSelector) : false;
$('.jscroll-next-parent', $e).remove(); // Remove the previous next link now that we have a new one
_checkNextHref();
if (_options.callback) {
Expand Down