Merge pull request #2652 from oat-sa/hotfix/AUT-3890/multiple-hottext…

…-when-disallowhtmlinhottext-enabled fix: multiple hottext support when disallowHTMLInHottext is enabled
oat-sa · Dec 20, 2024 · b104b2c · b104b2c
2 parents 72b8918 + 7712463
commit b104b2c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/views/js/loader/qtiLoader.min.js.map b/views/js/loader/qtiLoader.min.js.map
diff --git a/views/js/loader/taoQtiItem.min.js b/views/js/loader/taoQtiItem.min.js
diff --git a/views/js/loader/taoQtiItem.min.js.map b/views/js/loader/taoQtiItem.min.js.map
diff --git a/views/js/loader/taoQtiItemRunner.es5.min.js.map b/views/js/loader/taoQtiItemRunner.es5.min.js.map
diff --git a/views/js/loader/taoQtiItemRunner.min.js.map b/views/js/loader/taoQtiItemRunner.min.js.map
diff --git a/views/js/qtiCreator/widgets/helpers/selectionWrapper.js b/views/js/qtiCreator/widgets/helpers/selectionWrapper.js
@@ -134,10 +134,10 @@ define(['jquery'], function ($) {
              * @param {jQuery} $wrapper - the element that will wrap the selection
              * @returns {boolean}
              */
-            wrapWith: function wrapWith($wrapper) {
-                const range = selection.getRangeAt(0);
+            wrapWith: function wrapWith($wrapper, providedRange) {
+                const range = providedRange || selection.getRangeAt(0);
 
-                if (this.canWrap()) {
+                if (this.canWrap(range)) {
                     try {
                         range.surroundContents($wrapper[0]);
                         selection.removeAllRanges();

diff --git a/views/js/qtiCreator/widgets/interactions/hottextInteraction/states/Question.js b/views/js/qtiCreator/widgets/interactions/hottextInteraction/states/Question.js
@@ -139,7 +139,7 @@ define([
             } else {
                 if (
                     $cloneContent.text() === $cloneContent.html() &&
-                    wrapper.wrapWith($newHottextClone)
+                    wrapper.wrapWith($newHottextClone, range)
                 ) {
                     await this.createNewHottext($newHottextClone);
                 } else {