Skip to content

Commit

Permalink
fix: hide loading message on iframe load (#2137)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Warzeski authored Dec 11, 2023
1 parent eafd1e1 commit 337c68b
Show file tree
Hide file tree
Showing 17 changed files with 2,660 additions and 4 deletions.
1 change: 1 addition & 0 deletions openassessment/templates/openassessmentblock/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ <h4 class="step__title">
</div>

<div class="openassessment-initial-wrapper" id="ora-mfe-view">
<div class="ora-loading">Loading Open Response Assessment...</div>
<iframe
title="title"
allow="microphone *; camera *; midi *; geolocation *; encrypted-media *, clipboard-write *"
Expand Down
8 changes: 4 additions & 4 deletions openassessment/xblock/static/dist/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"openassessment-editor-textarea.js.map": "/openassessment-editor-textarea.b8f866ba96a1d2ad92a4.js.map",
"openassessment-editor-tinymce.js": "/openassessment-editor-tinymce.2cc0cab55c3be729265e.js",
"openassessment-editor-tinymce.js.map": "/openassessment-editor-tinymce.2cc0cab55c3be729265e.js.map",
"openassessment-lms.css": "/openassessment-lms.1590835662418029291d.css",
"openassessment-lms.js": "/openassessment-lms.1590835662418029291d.js",
"openassessment-lms.css.map": "/openassessment-lms.1590835662418029291d.css.map",
"openassessment-lms.js.map": "/openassessment-lms.1590835662418029291d.js.map",
"openassessment-lms.css": "/openassessment-lms.a2e25f076c28e1b1d212.css",
"openassessment-lms.js": "/openassessment-lms.a2e25f076c28e1b1d212.js",
"openassessment-lms.css.map": "/openassessment-lms.a2e25f076c28e1b1d212.css.map",
"openassessment-lms.js.map": "/openassessment-lms.a2e25f076c28e1b1d212.js.map",
"openassessment-ltr.css": "/openassessment-ltr.5e4380a9281df732ca84.css",
"openassessment-ltr.js": "/openassessment-ltr.5e4380a9281df732ca84.js",
"openassessment-ltr.css.map": "/openassessment-ltr.5e4380a9281df732ca84.css.map",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions openassessment/xblock/static/js/src/lms/oa_base.js
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,12 @@ export class BaseView {
const courseId = $(this.element).data('course-id') || window.course?.id;

const oraMfeIframe = $('#ora-mfe-view>iframe', this.element);
const loadingEl = $('#ora-mfe-view .ora-loading', this.element);
// TODO: put the ORA MFE URL in a config file
oraMfeIframe.attr('src', `${this.ORA_MICROFRONTEND_URL}/xblock/${courseId}/${xblockId}`);
/* eslint-disable-next-line prefer-arrow-callback */
oraMfeIframe.on('load', function () {
loadingEl.remove();
/* eslint-disable-next-line prefer-arrow-callback */
window.addEventListener('message', function (event) {
if (event.data.type === 'plugin.resize') {
Expand Down

0 comments on commit 337c68b

Please sign in to comment.