@oat-sa/tao-core-ui 3.23.0 → 3.24.0

package/dist/figure/FigureStateActive.js

@@ -212,9 +212,9 @@ define(['jquery', 'nouislider', 'ui/resourcemgr', 'ui/tooltip', 'lodash', 'i18n'
      *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
-     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+     * Foundation, Inc., 31 Milk St # 960789 Boston, MA 02196 USA.
      *
-     * Copyright (c) 2021 (original work) Open Assessment Technologies SA ;
+     * Copyright (c) 2021-2026 (original work) Open Assessment Technologies SA ;
      *
      */
     const initAdvanced = function (widget) {
@@ -233,21 +233,45 @@ define(['jquery', 'nouislider', 'ui/resourcemgr', 'ui/tooltip', 'lodash', 'i18n'
       const $form = widget.$form;
       const options = widget.options;
       const {
-        img
+        img,
+        $img
       } = getImage(widget);
       const $uploadTrigger = $form.find('[data-role="upload-trigger"]');
       const $src = $form.find('input[name=src]');
       const $alt = $form.find('input[name=alt]');
+      const commitSrc = function (srcValue) {
+        $src.val(srcValue);
+        // Keep QTI model + preview in sync immediately: the form src callback is
+        // throttled (1s), so a late trailing call must not leave a rejected pick.
+        if (img) {
+          img.attr('src', srcValue);
+        }
+        if ($img && $img.length) {
+          $img.attr('src', srcValue ? widget.getAssetManager().resolve(srcValue) : '');
+          $img.trigger('contentChange.qti-widget').change();
+        }
+        _.defer(function () {
+          if (img) {
+            img.attr('off-media-editor', 1);
+          }
+          $src.trigger('change');
+        });
+      };
       const _openResourceMgr = function () {
         $uploadTrigger.resourcemgr({
           title: __('Please select an image file from the resource manager. You can add files from your computer with the button "Add file(s)".'),
           appendContainer: options.mediaManager.appendContainer,
           mediaSourcesUrl: options.mediaManager.mediaSourcesUrl,
           browseUrl: options.mediaManager.browseUrl,
+          searchUrl: options.mediaManager.searchUrl,
           uploadUrl: options.mediaManager.uploadUrl,
           deleteUrl: options.mediaManager.deleteUrl,
           downloadUrl: options.mediaManager.downloadUrl,
           fileExistsUrl: options.mediaManager.fileExistsUrl,
+          rootClassUri: options.mediaManager.rootClassUri,
+          classMappingUrl: options.mediaManager.classMappingUrl,
+          statusUrl: options.mediaManager.statusUrl,
+          maxListSize: options.mediaManager.maxListSize,
           params: {
             uri: options.uri,
             lang: options.lang,
@@ -267,41 +291,49 @@ define(['jquery', 'nouislider', 'ui/resourcemgr', 'ui/tooltip', 'lodash', 'i18n'
           pathParam: 'path',
           path: options.mediaManager.path,
           root: options.mediaManager.root,
+          currentAsset: $src.val() || null,
           select: function (e, files) {
             let file, alt;
             let confirmBox, cancel, save;
-            if (files && files.length) {
-              file = files[0].file;
-              alt = files[0].alt;
-              $src.val(file);
-              if ($$1.trim($alt.val()) === '') {
-                if (alt === '') {
-                  alt = extractLabel(file);
-                }
+            if (!(files && files.length)) {
+              return;
+            }
+            file = files[0].file;
+            alt = files[0].alt;
+
+            // Apply the new file immediately; alt confirm only decides alt text.
+            commitSrc(file);
+            if ($$1.trim($alt.val()) === '') {
+              if (alt === '') {
+                alt = extractLabel(file);
+              }
+              if (img) {
                 img.attr('alt', alt);
-                $alt.val(alt).trigger('change');
-              } else {
-                confirmBox = $$1('.change-alt-modal-feedback', $form);
-                cancel = confirmBox.find('.cancel');
-                save = confirmBox.find('.save');
-                $$1('.alt-text', confirmBox).html(`"${$alt.val()}"<br>${__('with')}<br>"${alt}" ?`);
-                confirmBox.modal({
-                  width: 500
-                });
-                save.off('click').on('click', function () {
-                  img.attr('alt', alt);
-                  $alt.val(alt).trigger('change');
-                  confirmBox.modal('close');
-                });
-                cancel.off('click').on('click', function () {
-                  confirmBox.modal('close');
-                });
               }
-              _.defer(function () {
-                img.attr('off-media-editor', 1);
-                $src.trigger('change');
-              });
+              $alt.val(alt).trigger('change');
+              return;
             }
+
+            // Existing alt: confirm replace. Cancel / overlay / Esc keeps the new image;
+            // only alt text stays unchanged unless the user confirms.
+            confirmBox = $$1('.change-alt-modal-feedback', $form);
+            cancel = confirmBox.find('.cancel');
+            save = confirmBox.find('.save');
+            const $altText = $$1('.alt-text', confirmBox).empty();
+            $altText.append(document.createTextNode(`"${$alt.val()}"`)).append($$1('<br>')).append(document.createTextNode(__('with'))).append($$1('<br>')).append(document.createTextNode(`"${alt}" ?`));
+            confirmBox.modal({
+              width: 500
+            });
+            save.off('click').on('click', function () {
+              if (img) {
+                img.attr('alt', alt);
+              }
+              $alt.val(alt).trigger('change');
+              confirmBox.modal('close');
+            });
+            cancel.off('click').on('click', function () {
+              confirmBox.modal('close');
+            });
           },
           open: function () {
             // hide tooltip if displayed

package/dist/image/ImgStateActive/initHelper.js

@@ -210,9 +210,9 @@ define(['exports', 'jquery', 'lodash', 'i18n', 'core/mimetype', 'ui/mediaEditor/
      *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
-     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+     * Foundation, Inc., 31 Milk St # 960789 Boston, MA 02196 USA.
      *
-     * Copyright (c) 2021 (original work) Open Assessment Technologies SA ;
+     * Copyright (c) 2021-2026 (original work) Open Assessment Technologies SA ;
      *
      */
     const initAdvanced = function (widget) {
@@ -231,21 +231,45 @@ define(['exports', 'jquery', 'lodash', 'i18n', 'core/mimetype', 'ui/mediaEditor/
       const $form = widget.$form;
       const options = widget.options;
       const {
-        img
+        img,
+        $img
       } = getImage(widget);
       const $uploadTrigger = $form.find('[data-role="upload-trigger"]');
       const $src = $form.find('input[name=src]');
       const $alt = $form.find('input[name=alt]');
+      const commitSrc = function (srcValue) {
+        $src.val(srcValue);
+        // Keep QTI model + preview in sync immediately: the form src callback is
+        // throttled (1s), so a late trailing call must not leave a rejected pick.
+        if (img) {
+          img.attr('src', srcValue);
+        }
+        if ($img && $img.length) {
+          $img.attr('src', srcValue ? widget.getAssetManager().resolve(srcValue) : '');
+          $img.trigger('contentChange.qti-widget').change();
+        }
+        _.defer(function () {
+          if (img) {
+            img.attr('off-media-editor', 1);
+          }
+          $src.trigger('change');
+        });
+      };
       const _openResourceMgr = function () {
         $uploadTrigger.resourcemgr({
           title: __('Please select an image file from the resource manager. You can add files from your computer with the button "Add file(s)".'),
           appendContainer: options.mediaManager.appendContainer,
           mediaSourcesUrl: options.mediaManager.mediaSourcesUrl,
           browseUrl: options.mediaManager.browseUrl,
+          searchUrl: options.mediaManager.searchUrl,
           uploadUrl: options.mediaManager.uploadUrl,
           deleteUrl: options.mediaManager.deleteUrl,
           downloadUrl: options.mediaManager.downloadUrl,
           fileExistsUrl: options.mediaManager.fileExistsUrl,
+          rootClassUri: options.mediaManager.rootClassUri,
+          classMappingUrl: options.mediaManager.classMappingUrl,
+          statusUrl: options.mediaManager.statusUrl,
+          maxListSize: options.mediaManager.maxListSize,
           params: {
             uri: options.uri,
             lang: options.lang,
@@ -265,41 +289,49 @@ define(['exports', 'jquery', 'lodash', 'i18n', 'core/mimetype', 'ui/mediaEditor/
           pathParam: 'path',
           path: options.mediaManager.path,
           root: options.mediaManager.root,
+          currentAsset: $src.val() || null,
           select: function (e, files) {
             let file, alt;
             let confirmBox, cancel, save;
-            if (files && files.length) {
-              file = files[0].file;
-              alt = files[0].alt;
-              $src.val(file);
-              if ($.trim($alt.val()) === '') {
-                if (alt === '') {
-                  alt = extractLabel(file);
-                }
+            if (!(files && files.length)) {
+              return;
+            }
+            file = files[0].file;
+            alt = files[0].alt;
+
+            // Apply the new file immediately; alt confirm only decides alt text.
+            commitSrc(file);
+            if ($.trim($alt.val()) === '') {
+              if (alt === '') {
+                alt = extractLabel(file);
+              }
+              if (img) {
                 img.attr('alt', alt);
-                $alt.val(alt).trigger('change');
-              } else {
-                confirmBox = $('.change-alt-modal-feedback', $form);
-                cancel = confirmBox.find('.cancel');
-                save = confirmBox.find('.save');
-                $('.alt-text', confirmBox).html(`"${$alt.val()}"<br>${__('with')}<br>"${alt}" ?`);
-                confirmBox.modal({
-                  width: 500
-                });
-                save.off('click').on('click', function () {
-                  img.attr('alt', alt);
-                  $alt.val(alt).trigger('change');
-                  confirmBox.modal('close');
-                });
-                cancel.off('click').on('click', function () {
-                  confirmBox.modal('close');
-                });
               }
-              _.defer(function () {
-                img.attr('off-media-editor', 1);
-                $src.trigger('change');
-              });
+              $alt.val(alt).trigger('change');
+              return;
             }
+
+            // Existing alt: confirm replace. Cancel / overlay / Esc keeps the new image;
+            // only alt text stays unchanged unless the user confirms.
+            confirmBox = $('.change-alt-modal-feedback', $form);
+            cancel = confirmBox.find('.cancel');
+            save = confirmBox.find('.save');
+            const $altText = $('.alt-text', confirmBox).empty();
+            $altText.append(document.createTextNode(`"${$alt.val()}"`)).append($('<br>')).append(document.createTextNode(__('with'))).append($('<br>')).append(document.createTextNode(`"${alt}" ?`));
+            confirmBox.modal({
+              width: 500
+            });
+            save.off('click').on('click', function () {
+              if (img) {
+                img.attr('alt', alt);
+              }
+              $alt.val(alt).trigger('change');
+              confirmBox.modal('close');
+            });
+            cancel.off('click').on('click', function () {
+              confirmBox.modal('close');
+            });
           },
           open: function () {
             // hide tooltip if displayed

package/dist/image/ImgStateActive.js

@@ -210,9 +210,9 @@ define(['jquery', 'nouislider', 'ui/resourcemgr', 'ui/tooltip', 'lodash', 'i18n'
      *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
-     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+     * Foundation, Inc., 31 Milk St # 960789 Boston, MA 02196 USA.
      *
-     * Copyright (c) 2021 (original work) Open Assessment Technologies SA ;
+     * Copyright (c) 2021-2026 (original work) Open Assessment Technologies SA ;
      *
      */
     const initAdvanced = function (widget) {
@@ -231,21 +231,45 @@ define(['jquery', 'nouislider', 'ui/resourcemgr', 'ui/tooltip', 'lodash', 'i18n'
       const $form = widget.$form;
       const options = widget.options;
       const {
-        img
+        img,
+        $img
       } = getImage(widget);
       const $uploadTrigger = $form.find('[data-role="upload-trigger"]');
       const $src = $form.find('input[name=src]');
       const $alt = $form.find('input[name=alt]');
+      const commitSrc = function (srcValue) {
+        $src.val(srcValue);
+        // Keep QTI model + preview in sync immediately: the form src callback is
+        // throttled (1s), so a late trailing call must not leave a rejected pick.
+        if (img) {
+          img.attr('src', srcValue);
+        }
+        if ($img && $img.length) {
+          $img.attr('src', srcValue ? widget.getAssetManager().resolve(srcValue) : '');
+          $img.trigger('contentChange.qti-widget').change();
+        }
+        _.defer(function () {
+          if (img) {
+            img.attr('off-media-editor', 1);
+          }
+          $src.trigger('change');
+        });
+      };
       const _openResourceMgr = function () {
         $uploadTrigger.resourcemgr({
           title: __('Please select an image file from the resource manager. You can add files from your computer with the button "Add file(s)".'),
           appendContainer: options.mediaManager.appendContainer,
           mediaSourcesUrl: options.mediaManager.mediaSourcesUrl,
           browseUrl: options.mediaManager.browseUrl,
+          searchUrl: options.mediaManager.searchUrl,
           uploadUrl: options.mediaManager.uploadUrl,
           deleteUrl: options.mediaManager.deleteUrl,
           downloadUrl: options.mediaManager.downloadUrl,
           fileExistsUrl: options.mediaManager.fileExistsUrl,
+          rootClassUri: options.mediaManager.rootClassUri,
+          classMappingUrl: options.mediaManager.classMappingUrl,
+          statusUrl: options.mediaManager.statusUrl,
+          maxListSize: options.mediaManager.maxListSize,
           params: {
             uri: options.uri,
             lang: options.lang,
@@ -265,41 +289,49 @@ define(['jquery', 'nouislider', 'ui/resourcemgr', 'ui/tooltip', 'lodash', 'i18n'
           pathParam: 'path',
           path: options.mediaManager.path,
           root: options.mediaManager.root,
+          currentAsset: $src.val() || null,
           select: function (e, files) {
             let file, alt;
             let confirmBox, cancel, save;
-            if (files && files.length) {
-              file = files[0].file;
-              alt = files[0].alt;
-              $src.val(file);
-              if ($.trim($alt.val()) === '') {
-                if (alt === '') {
-                  alt = extractLabel(file);
-                }
+            if (!(files && files.length)) {
+              return;
+            }
+            file = files[0].file;
+            alt = files[0].alt;
+
+            // Apply the new file immediately; alt confirm only decides alt text.
+            commitSrc(file);
+            if ($.trim($alt.val()) === '') {
+              if (alt === '') {
+                alt = extractLabel(file);
+              }
+              if (img) {
                 img.attr('alt', alt);
-                $alt.val(alt).trigger('change');
-              } else {
-                confirmBox = $('.change-alt-modal-feedback', $form);
-                cancel = confirmBox.find('.cancel');
-                save = confirmBox.find('.save');
-                $('.alt-text', confirmBox).html(`"${$alt.val()}"<br>${__('with')}<br>"${alt}" ?`);
-                confirmBox.modal({
-                  width: 500
-                });
-                save.off('click').on('click', function () {
-                  img.attr('alt', alt);
-                  $alt.val(alt).trigger('change');
-                  confirmBox.modal('close');
-                });
-                cancel.off('click').on('click', function () {
-                  confirmBox.modal('close');
-                });
               }
-              _.defer(function () {
-                img.attr('off-media-editor', 1);
-                $src.trigger('change');
-              });
+              $alt.val(alt).trigger('change');
+              return;
             }
+
+            // Existing alt: confirm replace. Cancel / overlay / Esc keeps the new image;
+            // only alt text stays unchanged unless the user confirms.
+            confirmBox = $('.change-alt-modal-feedback', $form);
+            cancel = confirmBox.find('.cancel');
+            save = confirmBox.find('.save');
+            const $altText = $('.alt-text', confirmBox).empty();
+            $altText.append(document.createTextNode(`"${$alt.val()}"`)).append($('<br>')).append(document.createTextNode(__('with'))).append($('<br>')).append(document.createTextNode(`"${alt}" ?`));
+            confirmBox.modal({
+              width: 500
+            });
+            save.off('click').on('click', function () {
+              if (img) {
+                img.attr('alt', alt);
+              }
+              $alt.val(alt).trigger('change');
+              confirmBox.modal('close');
+            });
+            cancel.off('click').on('click', function () {
+              confirmBox.modal('close');
+            });
           },
           open: function () {
             // hide tooltip if displayed

package/dist/previewer.js

@@ -213,7 +213,7 @@ define(['jquery', 'lodash', 'core/mimetype', 'core/pluginifier', 'ui/mediaplayer
               // stop the video and free the socket on file select from the action icons
               // stop video, free the socket and remove player interface on video deletion
               // stop video and free the socket on all other cases when video is selected or temporary hidden or modal window is closed
-              $controls = $('.actions a:nth-child(1), .actions a:nth-child(3), .icon-close, .upload-switcher, .select-action, .files li>span', '#mediaManager');
+              $controls = $('.actions a:nth-child(1), .actions a:nth-child(3), .icon-close, .upload-switcher, .select-action, .files-list tr, .files .desc', '#mediaManager');
               $controls.off('mousedown.mediaelement').on('mousedown.mediaelement', function (event) {
                 event.stopPropagation();
                 if (!$(this).closest('.mediaplayer').length) {