Merge pull request #2563 from oat-sa/fix/ADF-1766/defined-item-width

Fix/adf-1766/defined-item-width
oat-sa · Sep 19, 2024 · 679aef7 · 679aef7
2 parents 838caaa + 5bfb30d
commit 679aef7
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 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 b/views/js/loader/taoQtiItemRunner.es5.min.js
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 b/views/js/loader/taoQtiItemRunner.min.js
diff --git a/views/js/loader/taoQtiItemRunner.min.js.map b/views/js/loader/taoQtiItemRunner.min.js.map
diff --git a/views/js/qtiCreator/editor/styleEditor/itemResizer.js b/views/js/qtiCreator/editor/styleEditor/itemResizer.js
@@ -45,7 +45,8 @@ define([
                     max: Math.max(1200, targetWidth)
                 },
                 start: targetWidth
-            };
+            },
+            customCSSItemWidth;
 
         var reset = function() {
             itemResizer.find('[value="no-slider"]').trigger('click');
@@ -76,13 +77,14 @@ define([
         itemWidthPrompt.on('click', function() {
             // user intends to resize the item
             if(this.value === 'slider') {
-                input.val($target.width());
-                slider.val($target.width()).trigger('slide');
+                let width = customCSSItemWidth || $target.width();
+                input.val(width);
+                slider.val(width).trigger('slide');
                 sliderBox.slideDown();
 
                 item.data('responsive', false);
 
-                resizeItem($target.width());
+                resizeItem(width);
             }
             // user wants to use default
             else {
@@ -101,6 +103,7 @@ define([
         slider.on('slide', function() {
             var value = Math.round(slider.val());
             input.val(value);
+            customCSSItemWidth = value;
             resizeItem(value);
         });
 
@@ -120,6 +123,7 @@ define([
             var width;
             // make a proper width change
             if(style[target] && style[target].width) {
+                customCSSItemWidth = style[target].width;
                 width = parseInt(style[target].width, 10);
                 input.val(width);
                 slider.val(width);