Fix: Allow trickle on final branching article (fixes #203)

adaptlearning · Oct 26, 2023 · f07e0af · f07e0af
1 parent 9e31452
commit f07e0af
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/js/controller.js b/js/controller.js
@@ -99,10 +99,15 @@ class TrickleController extends Backbone.Controller {
    * Returns true if the current page is locked by trickle
    */
   get isTrickling() {
-    const isTrickling = Adapt.parentView.model.getAllDescendantModels().some(model => {
-      return model.get('_isAvailable') && model.get('_isTrickled') && model.get('_isLocked');
-    });
-    return isTrickling;
+    const currentDescendants = Adapt.parentView.model.getAllDescendantModels();
+    const isDescendantBlockedByTrickle = currentDescendants.some(model => model.get('_isAvailable') && model.get('_isTrickled') && model.get('_isLocked'));
+    if (isDescendantBlockedByTrickle) return true;
+    const TrickleModel = components.getModelClass('trickle-button');
+    const lastDescendant = currentDescendants[currentDescendants.length - 1];
+    const lastTrickleButton = currentDescendants.reverse().find(model => (model instanceof TrickleModel));
+    const isLastDescendantExpectingMoreChildren = (lastDescendant.get('_requireCompletionOf') === Number.POSITIVE_INFINITY && lastDescendant.get('_canRequestChild'));
+    const isLastTrickleButtonWaiting = (!lastTrickleButton?.get('_isComplete'));
+    return (isLastDescendantExpectingMoreChildren && isLastTrickleButtonWaiting);
   }
 
   /**