diff --git a/Resources/Public/Scripts/ScrollBrowser.js b/Resources/Public/Scripts/ScrollBrowser.js index 49b3ab98867964e1ff15d563b0782fcd62d1ed1e..395cbcb128af94e2fa05b75d41dfe42e546b2bca 100644 --- a/Resources/Public/Scripts/ScrollBrowser.js +++ b/Resources/Public/Scripts/ScrollBrowser.js @@ -1,7 +1,7 @@ /*************************************************************** * Copyright notice * - * (c) sgalinski Internet Services (http://www.sgalinski.de) + * (c) sgalinski Internet Services (https://www.sgalinski.de) * * All rights reserved * @@ -45,12 +45,12 @@ SG.ElementScrollBrowser.prototype = { resultList: null, /** - * @var string + * @var string|null */ url: null, /** - * @var string + * @var string|null */ lastUrl: null, @@ -75,7 +75,9 @@ SG.ElementScrollBrowser.prototype = { this.url = $('.tx-pagebrowse-next a').attr('href'); $(window).on( 'scroll', function() { - if (this.lock || !this.checkPosition() || this.url === undefined || this.url === this.lastUrl) { + var recordLockedOrNotInPosition = this.lock || !this.checkPosition(); + var urlIsInvalid = typeof this.url === 'undefined' || this.url === this.lastUrl; + if (recordLockedOrNotInPosition || urlIsInvalid) { return; }