Merge branch 'release-30.5.2'

oat-sa · Jan 17, 2024 · 353ced2 · 353ced2
2 parents 7336dcf + 7526782
commit 353ced2
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
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/helper/changeTracker.js b/views/js/qtiCreator/helper/changeTracker.js
@@ -41,6 +41,8 @@ define([
         exit: __('The item has unsaved changes, would you like to save it ?')
     };
 
+    const DISABLE_FIGURE_WIDGET = context.featureFlags && context.featureFlags.FEATURE_FLAG_DISABLE_FIGURE_WIDGET;
+
     /**
      *
      * @param {HTMLElement} container
@@ -120,8 +122,7 @@ define([
                         !$.contains(container, e.target) &&
                         !$(e.target).parents('#feedback-box').length &&
                         !$(e.target).parents('.outcome-container').length &&
-                        (context.featureFlags['FEATURE_FLAG_DISABLE_FIGURE_WIDGET'] ||
-                            !$(e.target).parents('.media-alignment').length) &&
+                        (DISABLE_FIGURE_WIDGET || !$(e.target).parents('.media-alignment').length) &&
                         !$(e.target).hasClass('icon-close') &&
                         this.hasChanged()
                     ) {

diff --git a/views/js/qtiCreator/model/Figure.js b/views/js/qtiCreator/model/Figure.js
@@ -25,7 +25,7 @@ define([
     'taoQtiItem/qtiCreator/model/Figcaption'
 ], function (_, context, editable, Figure, Img, Figcaption) {
     'use strict';
-    const DISABLE_FIGURE_WIDGET = context.featureFlags['FEATURE_FLAG_DISABLE_FIGURE_WIDGET'];
+    const DISABLE_FIGURE_WIDGET = context.featureFlags && context.featureFlags.FEATURE_FLAG_DISABLE_FIGURE_WIDGET;
     const methods = {};
     _.extend(methods, editable);
     _.extend(methods, {

diff --git a/views/js/qtiCreator/renderers/Img.js b/views/js/qtiCreator/renderers/Img.js
@@ -29,7 +29,7 @@ define([
 
     const CreatorImg = _.clone(Renderer);
 
-    const DISABLE_FIGURE_WIDGET = context.featureFlags['FEATURE_FLAG_DISABLE_FIGURE_WIDGET'];
+    const DISABLE_FIGURE_WIDGET = context.featureFlags && context.featureFlags.FEATURE_FLAG_DISABLE_FIGURE_WIDGET;
 
     CreatorImg.render = function (img, options) {
         const $container = Renderer.getContainer(img);

diff --git a/views/js/qtiCreator/widgets/static/figure/Widget.js b/views/js/qtiCreator/widgets/static/figure/Widget.js
@@ -30,7 +30,7 @@ define([
     'use strict';
 
     const FigureWidget = Widget.clone();
-    const DISABLE_FIGURE_WIDGET = context.featureFlags['FEATURE_FLAG_DISABLE_FIGURE_WIDGET'];
+    const DISABLE_FIGURE_WIDGET = context.featureFlags && context.featureFlags.FEATURE_FLAG_DISABLE_FIGURE_WIDGET;
 
     FigureWidget.initCreator = function initCreator(options) {
         const figure = this.element;

diff --git a/views/js/qtiCreator/widgets/static/text/states/Sleep.js b/views/js/qtiCreator/widgets/static/text/states/Sleep.js
@@ -4,7 +4,7 @@ define([
     'taoQtiItem/qtiCreator/widgets/static/states/Sleep',
     'taoQtiItem/qtiCreator/editor/gridEditor/content'
 ], function (context, stateFactory, SleepState, contentHelper) {
-    const DISABLE_FIGURE_WIDGET = context.featureFlags['FEATURE_FLAG_DISABLE_FIGURE_WIDGET'];
+    const DISABLE_FIGURE_WIDGET = context.featureFlags && context.featureFlags.FEATURE_FLAG_DISABLE_FIGURE_WIDGET;
 
     const TextBlockStateSleep = stateFactory.extend(
         SleepState,

diff --git a/views/js/qtiXmlRenderer/renderers/Figure.js b/views/js/qtiXmlRenderer/renderers/Figure.js
@@ -20,7 +20,7 @@ define(['context', 'tpl!taoQtiItem/qtiXmlRenderer/tpl/figure', 'tpl!taoQtiItem/q
     figureTpl,
     elementTpl
 ) {
-    const DISABLE_FIGURE_WIDGET = context.featureFlags['FEATURE_FLAG_DISABLE_FIGURE_WIDGET'];
+    const DISABLE_FIGURE_WIDGET = context.featureFlags && context.featureFlags.FEATURE_FLAG_DISABLE_FIGURE_WIDGET;
 
     return {
         qtiClass: 'figure',