Skip to content

Update jquery.jscroll.js #81

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
kishoreweblabs wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update jquery.jscroll.js #81

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4da57e5
Update jquery.jscroll.js
kishoreweblabs Oct 11, 2015
64f6daf
Update jquery.jscroll.js
kishoreweblabs Oct 11, 2015
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
49 changes: 40 additions & 9 deletions jquery.jscroll.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,27 @@
nextSelector: 'a:last',
contentSelector: '',
pagingSelector: '',
callback: false
callback: false,
beforeSend:false,
afterContentLoad:false,
reTriggerUntil:0

}
};

// Constructor
var jScroll = function($e, options) {

this.getdata=function(){
return $e.data('jscroll');
};

this.getOptions=function(){
return _options;
};



// Private vars and methods
var _data = $e.data('jscroll'),
_userOptions = (typeof options === 'function') ? { callback: options } : options,
Expand Down Expand Up @@ -121,6 +135,9 @@
if (!$next.length) {
return;
}



if (_options.autoTrigger && (_options.autoTriggerUntil === false || _options.autoTriggerUntil > 0)) {
_nextWrap($next);
if (_$body.height() <= _$window.height()) {
Expand All @@ -134,11 +151,14 @@
}
} else {
_$scroll.unbind('.jscroll');
$next.bind('click.jscroll', function() {
$next.one('click.jscroll', function() {
_nextWrap($next);
_load();

_options.autoTriggerUntil=_options.reTriggerUntil;
return false;
});

}
},

Expand All @@ -151,23 +171,32 @@
$inner.append('<div class="jscroll-added" />')
.children('.jscroll-added').last()
.html('<div class="jscroll-loading">' + _options.loadingHtml + '</div>');

return $e.animate({scrollTop: $inner.outerHeight()}, 0, function() {
$inner.find('div.jscroll-added').last().load(data.nextHref, function(r, status) {

_options.beforeSend(data);

$.get(data.nextHref, function(r, status) {
if (status === 'error') {
return _destroy();
}
var $next = $(this).find(_options.nextSelector).first();

r=_options.afterContentLoad(r);
var div=$inner.find('div.jscroll-added').last();
div.html(r);
var $next = $(div).find(_options.nextSelector).first();
data.waiting = false;
data.nextHref = $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) {

_options.callback.call(this);
}
_debug('dir', data);


});
});


},

// Safe console debug - http://klauzinski.com/javascript/safe-firebug-console-in-javascript
Expand Down Expand Up @@ -197,7 +226,9 @@

// Expose API methods via the jQuery.jscroll namespace, e.g. $('sel').jscroll.method()
$.extend($e.jscroll, {
destroy: _destroy
destroy: _destroy,
getdata:this.getdata,
getOptions:this.getOptions
});
return $e;
};
Expand All @@ -216,4 +247,4 @@
});
};

})(jQuery);
})(jQuery);