From a3dfdddbc7cdd9cef69e3057f7e4c470e02556fe Mon Sep 17 00:00:00 2001
From: Stefan Galinski <stefan@sgalinski.de>
Date: Sun, 17 Jul 2016 22:00:00 +0200
Subject: [PATCH] [BUGFIX] Fix warnings in the endless scroll script
---
Resources/Public/Scripts/ScrollBrowser.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/Resources/Public/Scripts/ScrollBrowser.js b/Resources/Public/Scripts/ScrollBrowser.js
index 49b3ab9..395cbcb 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;
}
--
GitLab