Skip to content

Improve CSS and JS loading Asset.html.twig #1120

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve CSS and JS loading Asset.html.twig #1120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions src/Oro/Bundle/AssetBundle/Resources/views/Asset.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
{% macro css(src, extra_attributes) %}
{% if webpack_hmr_enabled() %}
{% if webpack_hmr_enabled() %}
<script src="{{ asset(src|webpack_asset) }}"></script>
{% else %}
<link rel="stylesheet" {{ extra_attributes|raw }} href="{{ asset(src) }}">
{% if 'styles-print' in src %}
<script>
document.addEventListener('DOMContentLoaded', function(){
const link = document.createElement('link');
link.rel = 'stylesheet';
link.href='{{ asset(src) }}';
link.media = 'print';
document.head.appendChild(link);
});
</script>
<noscript>
<link rel="stylesheet" {{ extra_attributes|raw }} href="{{ asset(src) }}">
</noscript>
{% else %}
<link rel="stylesheet" {{ extra_attributes|raw }} href="{{ asset(src) }}">
{% endif %}
{% endif %}
{% endmacro %}

{% macro js(src) %}
<script src="{{ asset(src) }}"></script>
<script defer src="{{ asset(src) }}"></script>
{% endmacro %}

{% macro js_modules_config(config) %}
Expand Down