Merge pull request #2823 from rebeccacremona/waypoints

Destroy infinite scroll waypoints when switching folders.
harvard-lil · Jul 27, 2020 · ef1f5c1 · ef1f5c1
2 parents 1b8e45a + 80bf159
commit ef1f5c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/perma_web/static/bundles/create.js b/perma_web/static/bundles/create.js
@@ -13565,9 +13565,11 @@ function initShowFolderDOM(query) {
   if (!query || !_babel_runtime_corejs3_core_js_stable_instance_trim__WEBPACK_IMPORTED_MODULE_5___default()(query).call(query)) {
     // clear query after user clicks a folder
     DOMHelpers.setInputValue('.search-query', '');
-  } // if fetching folder contents takes more than 500ms, show a loading message
+  } // destroy any existing infinite scroll Waypoints
 
 
+  Waypoint.destroyAll(); // if fetching folder contents takes more than 500ms, show a loading message
+
   showLoadingMessage = true;
 
   _babel_runtime_corejs3_core_js_stable_set_timeout__WEBPACK_IMPORTED_MODULE_2___default()(function () {

diff --git a/perma_web/static/js/links-list.module.js b/perma_web/static/js/links-list.module.js
@@ -116,6 +116,9 @@ function initShowFolderDOM (query) {
     DOMHelpers.setInputValue('.search-query', '');
   }
 
+  // destroy any existing infinite scroll Waypoints
+  Waypoint.destroyAll();
+
   // if fetching folder contents takes more than 500ms, show a loading message
   showLoadingMessage = true;
   setTimeout(function(){