Merge branch 'release-30.22.4'

oat-sa · Nov 14, 2024 · 0add923 · 0add923
2 parents 05625f0 + 914ed92
commit 0add923
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 13 deletions.
diff --git a/views/css/item-creator.css b/views/css/item-creator.css
diff --git a/views/css/item-creator.css.map b/views/css/item-creator.css.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/qtiCreator/editor/ckEditor/htmlEditor.js b/views/js/qtiCreator/editor/ckEditor/htmlEditor.js
@@ -27,7 +27,8 @@ define([
     'taoQtiItem/qtiCreator/widgets/helpers/content',
     'taoQtiItem/qtiCreator/widgets/helpers/deletingState',
     'taoQtiItem/qtiCreator/editor/ckEditor/featureFlag',
-    'taoQtiItem/qtiCreator/helper/languages'
+    'taoQtiItem/qtiCreator/helper/languages',
+    'taoQtiItem/qtiCreator/helper/elementSupport',
 ], function (
     _,
     __,
@@ -40,7 +41,8 @@ define([
     contentHelper,
     deletingHelper,
     featureFlag,
-    languages
+    languages,
+    elementSupportHelper
 ) {
     'use strict';
 
@@ -133,8 +135,7 @@ define([
                         const $newImgPlaceholder = $editable.find('[data-new="true"][data-qti-class="img"]');
                         if (
                             $newImgPlaceholder.length &&
-                            !$editable.closest('.qti-choice, .qti-flow-container').length &&
-                            !$newImgPlaceholder.closest('.qti-table caption').length
+                            elementSupportHelper.isFigureSupportedInParent($newImgPlaceholder)
                         ) {
                             // instead img will add figure element
                             $newImgPlaceholder.attr('data-qti-class', 'figure');

diff --git a/views/js/qtiCreator/helper/elementSupport.js b/views/js/qtiCreator/helper/elementSupport.js
@@ -0,0 +1,42 @@
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright (c) 2024 (original work) Open Assessment Technologies SA ;
+ */
+
+define([], function () {
+    'use strict';
+
+    /**
+     * Before inserting Figure widget, check if parent element supports it.
+     * If supported, image wrap will be implemented as `<figure class="wrap-right"><img></figure>`.
+     * If not supported, image wrap will be implemented as `<img class="wrap-right">`
+     * @param {JQuery} $container
+     * @returns {boolean}
+     */
+    const isFigureSupportedInParent = ($container) => {
+        const notSupported =  (
+            $container.closest('.qti-choice, .qti-flow-container').length ||
+            $container.closest('.qti-table caption').length ||
+            $container.closest('.qti-modalFeedback').length ||
+            ($container.closest('.qti-customInteraction').length && !$container.closest('[data-element-support-figure="true"]').length)
+        );
+        return !notSupported;
+    };
+
+    return {
+        isFigureSupportedInParent
+    };
+});
diff --git a/views/js/qtiCreator/renderers/Img.js b/views/js/qtiCreator/renderers/Img.js
@@ -23,8 +23,9 @@ define([
     'taoQtiItem/qtiCreator/widgets/static/img/Widget',
     'taoQtiItem/qtiCreator/widgets/static/figure/Widget',
     'taoQtiItem/qtiCreator/model/Figure',
-    'taoQtiItem/qtiCreator/helper/findParentElement'
-], function (_, context, Renderer, Widget, FigureWidget, FigureModel, findParentElement) {
+    'taoQtiItem/qtiCreator/helper/findParentElement',
+    'taoQtiItem/qtiCreator/helper/elementSupport',
+], function (_, context, Renderer, Widget, FigureWidget, FigureModel, findParentElement, elementSupportHelper) {
     'use strict';
 
     const CreatorImg = _.clone(Renderer);
@@ -59,9 +60,7 @@ define([
 
         if (
             !DISABLE_FIGURE_WIDGET &&
-            !$container.closest('.qti-choice, .qti-flow-container').length &&
-            !$container.closest('.qti-table caption').length &&
-            !$container.closest('.qti-modalFeedback').length
+            elementSupportHelper.isFigureSupportedInParent($container)
         ) {
             const parent = findParentElement(img.rootElement, img.serial);
             parent.removeElement(img);

diff --git a/views/js/qtiCreator/widgets/static/figure/Widget.js b/views/js/qtiCreator/widgets/static/figure/Widget.js
@@ -78,6 +78,9 @@ define([
             $img.attr('width', '100%');
             $img.removeAttr('style');
         }
+
+        this.$container.attr('contenteditable', false); //case: textReaderInteraction PCI
+
         return this;
     };
 

diff --git a/views/scss/item-creator.scss b/views/scss/item-creator.scss
@@ -1148,6 +1148,9 @@ img.dragging.ui-draggable-dragging {
                         display: flex;
                     }
                 }
+                .cke_editable {
+                    clear: both;
+                }
             }
             .qti-interaction {
                 .add-option {