Skip to content

Update from juniper/main (production) #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 28, 2024
Merged

Update from juniper/main (production) #249

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b24845
Move iframe-render script earlier to run it as fast as possible
Aug 27, 2024
d3dfc04
Remove redundant async option from iframe-render
Aug 27, 2024
644e572
Merge pull request #248 from appsembler/hide-html-elements-in-iframe
VladyslavTy Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lms/templates/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
</title>
</%block>

<script type="text/javascript" src="${static.url("lms/js/iframe-render.js")}"></script>

% if not allow_iframing:
<script type="text/javascript">
/* immediately break out of an iframe if coming from the marketing website */
Expand Down Expand Up @@ -126,7 +128,6 @@
}).call(this, require || RequireJS.require);
</script>
<script type="text/javascript" src="${static.url("lms/js/require-config.js")}"></script>
<script type="text/javascript" src="${static.url("lms/js/iframe-render.js")}"></script>
<%block name="js_overrides">
${render_require_js_path_overrides(settings.REQUIRE_JS_PATH_OVERRIDES) | n, decode.utf8}
</%block>
Expand Down
Loading