Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 98a51f9

Browse files
authored
Merge pull request #137 from symfony-cmf/avoid-duplicated-loads
Avoid duplicated loads
2 parents 2cd3a5a + 8990f1c commit 98a51f9

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

_build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fi
1818
cp ./bower_components/jquery/dist/jquery.min.js ./src/Resources/public/vendor/jquery/dist/jquery.min.js
1919

2020
# jQuery UI
21-
if [ ! -d "./Resources/public/vendor/jquery-ui" ]; then
22-
mkdir ./Resources/public/vendor/jquery-ui
21+
if [ ! -d "./src/Resources/public/vendor/jquery-ui" ]; then
22+
mkdir ./src/Resources/public/vendor/jquery-ui
2323
fi
2424
cp ./bower_components/jquery-ui/jquery-ui.min.js ./src/Resources/public/vendor/jquery-ui/jquery-ui.min.js

src/Resources/views/Base/scripts.html.twig

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<script>window.jQuery.ui || document.write('<script src="{{ asset(assetsBasePath ~ '/jquery-ui/jquery-ui.min.js') }}"><\/script>')</script>
66
{% endif %}
77

8-
<script src="{{ asset('bundles/cmftreebrowser/js/cmf_tree_browser.' ~ treeAdapter ~ '.js?' ~ 'now'|date('U')) }}" type="text/javascript"></script>
9-
10-
<link rel="stylesheet" href="{{ asset('bundles/cmftreebrowser/css/cmf_tree_browser.' ~ treeAdapter ~ '.css') }}" media="all"/>
8+
<script>
9+
if (jQuery.fn.cmfTree === undefined) {
10+
document.write('<script src="{{ asset('bundles/cmftreebrowser/js/cmf_tree_browser.' ~ treeAdapter ~ '.js' ~ (app.debug ? 'now'|date('?U') : '')) }}"><\/script>');
11+
document.write('<link rel="stylesheet" href="{{ asset('bundles/cmftreebrowser/css/cmf_tree_browser.' ~ treeAdapter ~ '.css') }}" media="all"/>');
12+
}
13+
</script>

0 commit comments

Comments
 (0)