fixup! MDL-79194 core_courseformat: optimize section reload

ferranrecio · Oct 18, 2023 · 85d68d0 · 85d68d0
1 parent 7a73895
commit 85d68d0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/course/format/amd/build/local/content.min.js b/course/format/amd/build/local/content.min.js
diff --git a/course/format/amd/build/local/content.min.js.map b/course/format/amd/build/local/content.min.js.map
diff --git a/course/format/amd/src/local/content.js b/course/format/amd/src/local/content.js
@@ -527,13 +527,13 @@ export default class Component extends BaseComponent {
         if (debouncedReload) {
             return debouncedReload;
         }
-        const pendingReload = new Pending(pendingKey);
         const reload = () => {
+            const pendingReload = new Pending(pendingKey);
             this.debouncedReloads.delete(pendingKey);
             const cmitem = this.getElement(this.selectors.CM, cmId);
             if (!cmitem) {
                 pendingReload.resolve();
-                return;
+                return pendingReload;
             }
             const promise = Fragment.loadFragment(
                 'core_courseformat',
@@ -558,12 +558,13 @@ export default class Component extends BaseComponent {
             }).catch(() => {
                 pendingReload.resolve();
             });
+            return pendingReload;
         };
         debouncedReload = debounce(
             reload,
             200,
             {
-                cancel: true, pending: pendingReload
+                cancel: true, pending: true
             }
         );
         this.debouncedReloads.set(pendingKey, debouncedReload);

diff --git a/lib/amd/build/utils.min.js b/lib/amd/build/utils.min.js
diff --git a/lib/amd/build/utils.min.js.map b/lib/amd/build/utils.min.js.map
diff --git a/lib/amd/src/utils.js b/lib/amd/src/utils.js
@@ -103,10 +103,7 @@ export const debounce = (
 
     const returnedFunction = (...args) => {
         if (pending && !debounceMap.has(returnedFunction)) {
-            if (typeof pending !== 'object') {
-                pending = new Pending('core/utils:debounce');
-            }
-            debounceMap.set(returnedFunction, pending);
+            debounceMap.set(returnedFunction, new Pending('core/utils:debounce'));
         }
         clearTimeout(timeout);
         timeout = setTimeout(async () => {