@oat-sa/tao-core-ui 1.66.0 → 1.66.2

package/src/figure/FigureStateActive.js

@@ -97,14 +97,12 @@ const formCallbacks = ({ widget, formElement, mediaEditor, togglePlaceholder })
 const initForm = ({ widget, formElement, formTpl, mediaEditor, togglePlaceholder }) => {
     const imageElem = getImageElement(widget);
     const figcaptionElem = getCaptionElement(widget);
-    const showFigure = widget.element.attr('showFigure');
     widget.$form.html(
         formTpl({
             baseUrl: widget.options.baseUrl || '',
             src: imageElem.attr('src'),
             alt: imageElem.attr('alt'),
-            figcaption: figcaptionElem ? figcaptionElem.body() : '',
-            showFigure: showFigure
+            figcaption: figcaptionElem ? figcaptionElem.body() : ''
         })
     );
 
@@ -127,15 +125,7 @@ const initForm = ({ widget, formElement, formTpl, mediaEditor, togglePlaceholder
     );
 };
 
-/**
- * @param {Object} stateFactory
- * @param {Object} ActiveState
- * @param {Object} formTpl
- * @param {Object} formElement
- * @param {Object} inlineHelper
- * @returns
- */
-export default function ({ stateFactory, ActiveState, formTpl, formElement, inlineHelper }) {
+export default function (stateFactory, ActiveState, formTpl, formElement, inlineHelper) {
     /**
      * media Editor instance if has been initialized
      * @type {null}
@@ -144,7 +134,7 @@ export default function ({ stateFactory, ActiveState, formTpl, formElement, inli
     let textareaObserver = null;
     let texareaHTMLElem = null;
 
-    const FigureStateActive = stateFactory.extend(
+    const ImgStateActive = stateFactory.extend(
         ActiveState,
         function () {
             this.initForm();
@@ -158,7 +148,7 @@ export default function ({ stateFactory, ActiveState, formTpl, formElement, inli
         }
     );
 
-    FigureStateActive.prototype.initForm = function () {
+    ImgStateActive.prototype.initForm = function () {
         initForm({
             widget: this.widget,
             formElement,
@@ -180,5 +170,5 @@ export default function ({ stateFactory, ActiveState, formTpl, formElement, inli
         }
     };
 
-    return FigureStateActive;
+    return ImgStateActive;
 }

package/src/mediaEditor/plugins/mediaAlignment/helper.js

@@ -15,34 +15,10 @@
  *
  * Copyright (c) 2021-2022  (original work) Open Assessment Technologies SA;
  */
-import _ from 'lodash';
 
 export const FLOAT_LEFT_CLASS = 'wrap-left';
 export const FLOAT_RIGHT_CLASS = 'wrap-right';
 
-const searchRecurse = (parentElement, serial) => {
-    if (!parentElement) {
-        return null;
-    }
-    if (parentElement.serial === serial) {
-        return parentElement;
-    }
-    let found = null;
-    _.some(parentElement['elements'], childElement => {
-        if (childElement.serial === serial) {
-            found = parentElement;
-        } else if (childElement['elements']) {
-            found = searchRecurse(childElement, serial);
-        } else if (childElement['prompt']) {
-            found = searchRecurse(childElement.prompt.bdy, serial);
-        }
-        if (found) {
-            return true;
-        }
-    });
-    return found;
-};
-
 export const positionFloat = function positionFloat(widget, position) {
     if (!position) {
         return;
@@ -67,36 +43,12 @@ export const positionFloat = function positionFloat(widget, position) {
     // Update DOM
     widget.$container.addClass(className);
     // Update model
-    const prevClassName = widget.element.attr('class') || '';
     if (className) {
         widget.element.attr('class', className);
     } else {
         widget.element.removeAttr('class');
     }
 
-    if (prevClassName !== className) {
-        // Re-build Figure widget to toggle between inline/block
-        const parent = searchRecurse(widget.element.bdy.rootElement.bdy, widget.serial);
-        // avoid changes on Figure in a prompt
-        if (parent.contentModel && parent.contentModel === 'inlineStatic') {
-            _.defer(() => {
-                widget.element.data('widget').refresh();
-            });
-            return;
-        }
-        widget.element.data('widget').changeState('sleep');
-        _.defer(() => {
-            if (parent && parent.data('widget')) {
-                parent.data('widget').changeState('active');
-                _.defer(() => {
-                    parent.data('widget').changeState('sleep');
-                    _.defer(() => {
-                        widget.element.data('widget').changeState('active');
-                    });
-                });
-            }
-        });
-    }
     widget.$original.trigger('contentChange.qti-widget');
 };
 

package/src/pageSizeSelector.js

@@ -28,7 +28,7 @@ import 'select2';
  * Default config values
  * @type {Object}
  */
-var defaults = {
+const defaults = {
     defaultSize: 25,
     options: [
         { label: '25 ' + __('items per page'), value: 25 },
@@ -47,15 +47,15 @@ var defaults = {
  * @param {Object} [config.items] - available options
  * @returns {pageSizeSelector}
  */
-var pageSizeSelectorFactory = function pageSizeSelectorFactory(config) {
-    var pageSizeSelectorSpecs = {
-        setSelectedOption: function setSelectedOption() {
-            var options = this.config.options;
-            var defaultSize = this.config.defaultSize;
+export default function pageSizeSelectorFactory(config) {
+    const pageSizeSelectorSpecs = {
+        setSelectedOption() {
+            const options = this.config.options;
+            const defaultSize = parseInt(this.config.defaultSize, 10);
 
-            var selectedOption;
-            options.forEach(function (option) {
-                if (option.value === defaultSize) {
+            let selectedOption;
+            options.forEach(option => {
+                if (parseInt(option.value, 10) === defaultSize) {
                     selectedOption = option;
 
                     option.selected = true;
@@ -73,34 +73,25 @@ var pageSizeSelectorFactory = function pageSizeSelectorFactory(config) {
 
     return component(pageSizeSelectorSpecs, defaults)
         .setTemplate(pageSizeSelectorTpl)
-        .on('init', function () {
+        .on('init', function onInit() {
             this.setSelectedOption();
         })
-        .on('render', function () {
-            var self = this;
-            var $component = this.getElement();
-
-            $('.select2', $component)
+        .on('render', function onRender() {
+            $('.select2', this.getElement())
                 .select2({
                     dropdownCssClass: 'page-size-dropdown',
                     minimumResultsForSearch: Infinity
                 })
-                .on('change', function (e) {
-                    self.trigger('change', e.val);
+                .on('change', e => {
+                    this.trigger('change', e.val);
                 });
         })
-        .after('render', function () {
-            var $component = this.getElement();
-
+        .after('render', function afterRender() {
             // Notify about the default value after render
-            this.trigger('change', $('select', $component).val());
+            this.trigger('change', $('select', this.getElement()).val());
         })
-        .on('destroy', function () {
-            var $component = this.getElement();
-
-            $('.select2', $component).select2('destroy');
+        .on('destroy', function onDestroy() {
+            $('.select2', this.getElement()).select2('destroy');
         })
         .init(config);
-};
-
-export default pageSizeSelectorFactory;
+}