Merge branch 'release/2.7.1-alpha.3'

educates · May 27, 2024 · ee793ac · ee793ac
2 parents 867f247 + 926ca1c
commit ee793ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/project-docs/release-notes/version-2.7.1.md b/project-docs/release-notes/version-2.7.1.md
@@ -66,3 +66,9 @@ Bugs Fixed
   workshop dashboard would still be accessible, but request objects would be
   missing. Timeout for workshop session registration has been increased to 90
   seconds.
+
+* If text followed a clickable action and the `cascade` option was used, the
+  subsequent clickable action would not be automatically triggered. It would
+  work okay if the next clickable action immediately followed the first. This
+  was broken when the cascade mechanim was extended to all clickable actions and
+  not just examiner clickable actions.
diff --git a/workshop-images/base-environment/opt/renderer/src/frontend/scripts/educates.ts b/workshop-images/base-environment/opt/renderer/src/frontend/scripts/educates.ts
@@ -829,10 +829,10 @@ export function register_action(options: any) {
                                 setTimeout(() => {
                                     if (generator.startsWith("Educates (asciidoc)")) {
                                         let root_element = parent_element.parent().parent()
-                                        root_element.next(`*[data-action-name]`).children("div.content").children("div.magic-code-block-title").trigger("click")
+                                        root_element.nextAll(`*[data-action-name]`).first().children("div.content").children("div.magic-code-block-title").trigger("click")
                                     }
                                     else {
-                                        parent_element.next(`*[data-action-name]`).trigger("click")
+                                        parent_element.nextAll(`*[data-action-name]`).first().trigger("click")
                                     }
                                 }, action_args.pause || pause)
                             }