Merge branch 'release-12.41.1'

oat-sa · Feb 1, 2024 · fa7961c · fa7961c
2 parents 4652de8 + 489053b
commit fa7961c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "oat-sa/oatbox-extension-installer": "~1.1||dev-master",
         "oat-sa/lib-generis-search": "^2.1.2",
         "oat-sa/generis": ">=15.24",
-        "oat-sa/tao-core": ">=53.12",
+        "oat-sa/tao-core": ">=54.0.0",
         "oat-sa/extension-tao-item": ">=v12.1.0",
         "oat-sa/extension-tao-itemqti": ">=29.14.5",
         "oat-sa/extension-tao-test": ">=15.16",

diff --git a/views/js/loader/taoMediaManager.min.js b/views/js/loader/taoMediaManager.min.js
diff --git a/views/js/loader/taoMediaManager.min.js.map b/views/js/loader/taoMediaManager.min.js.map
diff --git a/views/js/qtiCreator/editor/ckEditor/htmlEditor.js b/views/js/qtiCreator/editor/ckEditor/htmlEditor.js
@@ -343,7 +343,7 @@ define([
         options = options || {};
 
         //re-init all widgets:
-        _.each(_.values(container.elements), function (elt) {
+        _.forEach(_.values(container.elements), function (elt) {
             const widget = elt.data('widget'),
                 currentState = widget.getCurrentState().name;
 
@@ -387,7 +387,7 @@ define([
         const deleted = [];
         const container = $container.data('qti-container');
 
-        _.each(widgets, function (w) {
+        _.forEach(widgets, function (w) {
             if (!w.element.data('removed')) {
                 const $widget = _findWidgetContainer($container, w.serial);
                 if (!$widget.length) {
@@ -402,7 +402,7 @@ define([
 
             $messageBox
                 .on('confirm.deleting', function () {
-                    _.each(deleted, function (w) {
+                    _.forEach(deleted, function (w) {
                         w.element.remove();
                         w.destroy();
                     });

diff --git a/views/js/qtiCreator/editor/containerEditor.js b/views/js/qtiCreator/editor/containerEditor.js
@@ -126,7 +126,7 @@ define([
             container.setRootElement(item);
 
             if (options.metadata) {
-                _.each(options.metadata, function (value, name) {
+                _.forEach(options.metadata, function (value, name) {
                     item.data(name, value);
                 });
             }

diff --git a/views/js/qtiCreator/editor/styleEditor/fontSizeChanger.js b/views/js/qtiCreator/editor/styleEditor/fontSizeChanger.js
@@ -102,7 +102,7 @@ define(['jquery', 'lodash', 'taoMediaManager/qtiCreator/editor/styleEditor/style
             if (c === 13) {
                 $input.trigger('blur');
             }
-            return _.contains([8, 37, 39, 46], c) || (c >= 48 && c <= 57) || (c >= 96 && c <= 105);
+            return _.includes([8, 37, 39, 46], c) || (c >= 48 && c <= 57) || (c >= 96 && c <= 105);
         });
 
         /**

diff --git a/views/js/qtiCreator/widgets/helpers/content.js b/views/js/qtiCreator/widgets/helpers/content.js
@@ -47,7 +47,7 @@ define([
 
             creatorRenderer.get().load(function(){
 
-                _.each(newElts, function(serial) {
+                _.forEach(newElts, function(serial) {
                     let $placeholder,
                         $widget,
                         widget;

diff --git a/views/js/qtiCreator/widgets/item/Widget.js b/views/js/qtiCreator/widgets/item/Widget.js
@@ -223,7 +223,7 @@ define([
     const _detachElements = function(container, elements) {
 
         const containerElements = {};
-        _.each(elements, function(elementSerial){
+        _.forEach(elements, function(elementSerial){
             containerElements[elementSerial] = container.elements[elementSerial];
             delete container.elements[elementSerial];
         });
@@ -317,7 +317,7 @@ define([
 
                 } else {
 
-                    _.each(newElts, function(container){
+                    _.forEach(newElts, function(container){
 
                         const containerData = subContainers.shift();//get data in order
                         const containerElements = _detachElements(itemBody, containerData.elements);