@oat-sa/tao-core-ui 3.9.0 → 3.9.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -77,7 +77,11 @@ define(['exports', 'context', 'lodash'], function (exports, context, _) { 'use s
|
|
|
77
77
|
}
|
|
78
78
|
if (!context.featureFlags['FEATURE_FLAG_DISABLE_FIGURE_WIDGET'] && prevClassName !== className) {
|
|
79
79
|
// Re-build Figure widget to toggle between inline/block
|
|
80
|
-
const parent = searchRecurse(widget.element.
|
|
80
|
+
const parent = searchRecurse(widget.element.rootElement.bdy, widget.serial);
|
|
81
|
+
// If it's Image not Figure (Choice, GapMatch/HotText qti-flow-container)
|
|
82
|
+
if (!parent) {
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
81
85
|
// If Figure is not in A-block (Prompt, TextReader PCI)
|
|
82
86
|
if (parent.contentModel === 'inlineStatic' || widget.$container.closest('.qti-customInteraction').length) {
|
|
83
87
|
_.defer(() => {
|
|
@@ -449,9 +449,16 @@ define(['jquery', 'lodash', 'i18n', 'core/eventifier', 'core/polling', 'core/dat
|
|
|
449
449
|
if (!config.url || !config.url.download) {
|
|
450
450
|
throw new TypeError('config.url.download is not configured while download() is being called');
|
|
451
451
|
}
|
|
452
|
-
return this.getCached(taskId).then(function (
|
|
453
|
-
let
|
|
454
|
-
|
|
452
|
+
return this.getCached(taskId).then(function () {
|
|
453
|
+
let taskData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
454
|
+
const {
|
|
455
|
+
redirectUrl,
|
|
456
|
+
category
|
|
457
|
+
} = taskData;
|
|
458
|
+
|
|
459
|
+
// if the task is an update task, we should not use redirectUrl for download
|
|
460
|
+
// it only uses for DOCX file download (export category)
|
|
461
|
+
if (redirectUrl && category !== 'update') {
|
|
455
462
|
return new Promise(function (resolve) {
|
|
456
463
|
$.fileDownload(redirectUrl, {
|
|
457
464
|
httpMethod: 'GET',
|
package/package.json
CHANGED
|
@@ -81,7 +81,11 @@ export const positionFloat = function positionFloat(widget, position) {
|
|
|
81
81
|
|
|
82
82
|
if (!context.featureFlags['FEATURE_FLAG_DISABLE_FIGURE_WIDGET'] && prevClassName !== className) {
|
|
83
83
|
// Re-build Figure widget to toggle between inline/block
|
|
84
|
-
const parent = searchRecurse(widget.element.
|
|
84
|
+
const parent = searchRecurse(widget.element.rootElement.bdy, widget.serial);
|
|
85
|
+
// If it's Image not Figure (Choice, GapMatch/HotText qti-flow-container)
|
|
86
|
+
if (!parent) {
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
85
89
|
// If Figure is not in A-block (Prompt, TextReader PCI)
|
|
86
90
|
if (parent.contentModel === 'inlineStatic' || widget.$container.closest('.qti-customInteraction').length) {
|
|
87
91
|
_.defer(() => {
|
|
@@ -496,10 +496,12 @@ export default function taskQueueModel(config) {
|
|
|
496
496
|
throw new TypeError('config.url.download is not configured while download() is being called');
|
|
497
497
|
}
|
|
498
498
|
|
|
499
|
-
return this.getCached(taskId).then(function (taskData) {
|
|
500
|
-
|
|
499
|
+
return this.getCached(taskId).then(function (taskData = {}) {
|
|
500
|
+
const { redirectUrl, category } = taskData;
|
|
501
501
|
|
|
502
|
-
if
|
|
502
|
+
// if the task is an update task, we should not use redirectUrl for download
|
|
503
|
+
// it only uses for DOCX file download (export category)
|
|
504
|
+
if (redirectUrl && category !== 'update') {
|
|
503
505
|
return new Promise(function (resolve) {
|
|
504
506
|
$.fileDownload(redirectUrl, {
|
|
505
507
|
httpMethod: 'GET',
|