Merge branch 'release-30.20.1'

oat-sa · Aug 16, 2024 · 4cae14b · 4cae14b
2 parents c04cdbd + 305efc4
commit 4cae14b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 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/gridEditor/resizable.js b/views/js/qtiCreator/editor/gridEditor/resizable.js
@@ -57,6 +57,12 @@ define([
         $el.find('[class^="col-"], [class*=" col-"]').each(function () {
             let $col = $(this);
 
+            // Skip if the element is inside a PCI.
+            // In this case, this is most probably a custom style rather than a TAO controlled grid.
+            if ($col.closest('.qti-customInteraction').length) {
+                return true;
+            }
+
             //@todo this should be more generic
             //see draggable etc for more references
             if ($col.parent().hasClass('fixed-grid-row')) {

diff --git a/views/scss/item-creator.scss b/views/scss/item-creator.scss
@@ -1235,7 +1235,7 @@ img.dragging.ui-draggable-dragging {
                 border-left: 1px solid $itemCreatorMiniTlbBorderColor;
             }
         }
-       
+
     }
 
     .qti-interaction {
@@ -1446,6 +1446,17 @@ img.dragging.ui-draggable-dragging {
         direction: rtl;
     }
 }
+body, #mediaManager {
+    // Enforces the style for modal elements.
+    // This is necessary to avoid conflicts with PCI styles.
+    & > .modal {
+        z-index: 105002;
+        height: auto;
+    }
+    & > .modal-bg {
+        z-index: 100001;
+    }
+}
 #mediaManager {
     .file-preview {
         .previewer {