arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Squash jquery and popper together

Browse Source
This commit is contained in:
FreneticScribbler
2021-02-22 23:41:42 +00:00
parent ff780f2042
commit 8505d5e93a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gulpfile.js
View File

@@ -44,9 +44,10 @@ function scripts() {
const base_scripts = ["src.js", "util.js", "alert.js", "collapse.js", "dropdown.js", "modal.js", "konami.js"]; const base_scripts = ["src.js", "util.js", "alert.js", "collapse.js", "dropdown.js", "modal.js", "konami.js"];
const bs_select = ["bootstrap-select.js", "ajax-bootstrap-select.js"] const bs_select = ["bootstrap-select.js", "ajax-bootstrap-select.js"]
const interaction = ["html5sortable.min.js", "interaction.js"] const interaction = ["html5sortable.min.js", "interaction.js"]
return gulp.src(['node_modules/jquery/dist/jquery.js', const jpop = ["jquery.min.js", "popper.min.js"]
return gulp.src(['node_modules/jquery/dist/jquery.min.js',
/* JQuery Plugins */ /* JQuery Plugins */
'node_modules/popper.js/dist/umd/popper.js', 'node_modules/popper.js/dist/umd/popper.min.js',
/* Bootstrap Plugins */ /* Bootstrap Plugins */
'node_modules/bootstrap/js/dist/util.js', 'node_modules/bootstrap/js/dist/util.js',
'node_modules/bootstrap/js/dist/tooltip.js', 'node_modules/bootstrap/js/dist/tooltip.js',
@@ -68,6 +69,7 @@ function scripts() {
.pipe(gulpif(function(file) { return base_scripts.includes(file.relative);}, con('base.js'))) .pipe(gulpif(function(file) { return base_scripts.includes(file.relative);}, con('base.js')))
.pipe(gulpif(function(file) { return bs_select.includes(file.relative);}, con('selects.js'))) .pipe(gulpif(function(file) { return bs_select.includes(file.relative);}, con('selects.js')))
.pipe(gulpif(function(file) { return interaction.includes(file.relative);}, con('interaction.js'))) .pipe(gulpif(function(file) { return interaction.includes(file.relative);}, con('interaction.js')))
.pipe(gulpif(function(file) { return jpop.includes(file.relative);}, con('jpop.js')))
.pipe(flatten()) .pipe(flatten())
.pipe(terser()) .pipe(terser())
.pipe(gulp.dest(dest)) .pipe(gulp.dest(dest))

3
templates/base.html
View File

@@ -21,8 +21,7 @@
{% block css %} {% block css %}
{% endblock %} {% endblock %}
<script src="{% static 'js/jquery.js' %}"></script> <script src="{% static 'js/jpop.js' %}" async></script>
<script src="{% static 'js/popper.js' %}"></script>
{% block preload_js %} {% block preload_js %}
{% endblock %} {% endblock %}