v1.18.x
psychobunny
parent 1853cc3cc1
commit e017ad432f

@ -164,10 +164,10 @@ module.exports = function(Meta) {
var basePath = path.resolve(__dirname, '../..');
if (target === 'nodebb.min.js') {
Meta.js.target[target].scripts = Meta.js.scripts.base.concat(pluginsScripts, Meta.js.scripts.rjs);
} else {
Meta.js.target[target].scripts = pluginsScripts;
Meta.js.target[target].scripts = Meta.js.scripts.base.concat(pluginsScripts);
if (target === 'nodebb.min.js') {
Meta.js.target[target].scripts = Meta.js.target[target].scripts.concat(Meta.js.scripts.rjs);
}
Meta.js.target[target].scripts = Meta.js.target[target].scripts.map(function(script) {

@ -30,7 +30,6 @@
<script type="text/javascript" src="{relative_path}/vendor/chart.js/chart.min.js?{cache-buster}"></script>
<script type="text/javascript" src="{relative_path}/vendor/hammer/hammer.min.js?{cache-buster}"></script>
<script type="text/javascript" src="{relative_path}/vendor/jquery/sortable/Sortable.js?{cache-buster}"></script>
<script type="text/javascript" src="{relative_path}/nodebb.min.js?{cache-buster}"></script>
<script type="text/javascript" src="{relative_path}/acp.min.js?{cache-buster}"></script>
<script>
require.config({

Loading…
Cancel
Save