From ffbcfe28a9f97c4c5ddf3932c6b980eeb503a54a Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Mon, 22 Feb 2021 01:00:12 +0000
Subject: [PATCH] Concat select styles/js

---
 RIGS/templates/event_checklist_form.html |  9 ++-------
 RIGS/templates/event_form.html           | 10 ++--------
 RIGS/templates/risk_assessment_form.html |  9 ++-------
 assets/templates/asset_audit_list.html   |  1 -
 assets/templates/asset_form.html         |  7 ++-----
 assets/templates/asset_list.html         |  9 ++-------
 gulpfile.js                              |  4 ++++
 7 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/RIGS/templates/event_checklist_form.html b/RIGS/templates/event_checklist_form.html
index 958303cf..08177cd0 100644
--- a/RIGS/templates/event_checklist_form.html
+++ b/RIGS/templates/event_checklist_form.html
@@ -7,25 +7,20 @@
 
 {% block css %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
-    <link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
+    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block preload_js %}
     {{ block.super }}
-    <script src="{% static 'js/bootstrap-select.js' %}"></script>
-    <script src="{% static 'js/ajax-bootstrap-select.js' %}"></script>
+    <script src="{% static 'js/selects.js' %}"></script>
 {% endblock %}
 
 {% block js %}
     {{ block.super }}
     <script src="{% static 'js/jquery-ui.js' %}"></script><!--TODO optimise-->
     <script src="{% static 'js/interaction.js' %}"></script>
-    <script src="{% static 'js/modal.js' %}"></script>
     <script src="{% static 'js/tooltip.js' %}"></script>
 
-    <script src="{% static 'js/autocompleter.js' %}"></script>
-
     {% include 'partials/datetime-fix.html' %}
 
     <script>
diff --git a/RIGS/templates/event_form.html b/RIGS/templates/event_form.html
index d53955e3..465985cf 100644
--- a/RIGS/templates/event_form.html
+++ b/RIGS/templates/event_form.html
@@ -7,26 +7,20 @@
 
 {% block css %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
-    <link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
-    <link rel="stylesheet" href="{% static 'css/flatpickr.css' %}"/>
+    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block preload_js %}
     {{ block.super }}
-    <script src="{% static 'js/bootstrap-select.js' %}"></script>
-    <script src="{% static 'js/ajax-bootstrap-select.js' %}"></script>
+    <script src="{% static 'js/selects.js' %}"></script>
 {% endblock %}
 
 {% block js %}
     {{ block.super }}
     <script src="{% static 'js/jquery-ui.js' %}"></script><!--TODO optimise--->
     <script src="{% static 'js/interaction.js' %}"></script>
-    <script src="{% static 'js/modal.js' %}"></script>
     <script src="{% static 'js/tooltip.js' %}"></script>
 
-    <script src="{% static 'js/autocompleter.js' %}"></script>
-
     {% include 'partials/datetime-fix.html' %}
 
     <script>
diff --git a/RIGS/templates/risk_assessment_form.html b/RIGS/templates/risk_assessment_form.html
index 2171a584..c9d24f94 100644
--- a/RIGS/templates/risk_assessment_form.html
+++ b/RIGS/templates/risk_assessment_form.html
@@ -6,25 +6,20 @@
 
 {% block css %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
-    <link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
+    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block preload_js %}
     {{ block.super }}
-    <script src="{% static 'js/bootstrap-select.js' %}"></script>
-    <script src="{% static 'js/ajax-bootstrap-select.js' %}"></script>
+    <script src="{% static 'js/selects.js' %}"></script>
 {% endblock %}
 
 {% block js %}
     {{ block.super }}
     <script src="{% static 'js/jquery-ui.js' %}"></script><!--TODO optimise--->
     <script src="{% static 'js/interaction.js' %}"></script>
-    <script src="{% static 'js/modal.js' %}"></script>
     <script src="{% static 'js/tooltip.js' %}"></script>
 
-    <script src="{% static 'js/autocompleter.js' %}"></script>
-
     <script>
         function parseBool(str) {
             return str.toLowerCase() == 'true';
diff --git a/assets/templates/asset_audit_list.html b/assets/templates/asset_audit_list.html
index 31a93fd0..e6eb41fb 100644
--- a/assets/templates/asset_audit_list.html
+++ b/assets/templates/asset_audit_list.html
@@ -6,7 +6,6 @@
 {% block js %}
     <script src="{% static 'js/jquery-ui.js' %}"></script>
     <script src="{% static "js/interaction.js" %}"></script>
-    <script src="{% static "js/modal.js" %}"></script>
     <script>
     $('document').ready(function(){
         $('#asset-search-form').submit(function () {
diff --git a/assets/templates/asset_form.html b/assets/templates/asset_form.html
index 8f676b4d..0070a15d 100644
--- a/assets/templates/asset_form.html
+++ b/assets/templates/asset_form.html
@@ -3,14 +3,11 @@
 {% load static %}
 
 {% block css %}
-    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
-    <link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
+    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block js %}
-    <script src="{% static 'js/bootstrap-select.js' %}"></script>
-    <script src="{% static 'js/ajax-bootstrap-select.js' %}"></script>
-    <script src="{% static 'js/autocompleter.js' %}"></script>
+    <script src="{% static 'js/selects.js' %}"></script>
     <script>
         const matches = window.matchMedia("(prefers-reduced-motion: reduce)").matches || window.matchMedia("(update: slow)").matches;
         dur = matches ? 0 : 500;
diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index 8210f0ee..6b35b27c 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -5,16 +5,11 @@
 {% load static %}
 
 {% block css %}
-    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
-    <link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
-{% endblock %}
-
-{% block preload_js %}
-    <script src="{% static 'js/bootstrap-select.js' %}"></script>
-    <script src="{% static 'js/ajax-bootstrap-select.js' %}"></script>
+    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block js %}
+    <script src="{% static 'js/selects.js' %}"></script>
     <script>
         //Get querystring value
         function getParameterByName(name) {
diff --git a/gulpfile.js b/gulpfile.js
index ca12eff4..a78a88a3 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -19,6 +19,7 @@ const ignore = require('gulp-ignore');
 sass.compiler = require('node-sass');
 
 function styles(done) {
+    const bs_select = ["bootstrap-select.css", "ajax-bootstrap-select.css"]
     return gulp.src(['pipeline/source_assets/scss/**/*.scss',
                     'node_modules/fullcalendar/main.css',
                     'node_modules/bootstrap-select/dist/css/bootstrap-select.css',
@@ -26,6 +27,7 @@ function styles(done) {
                     'node_modules/flatpickr/dist/flatpickr.css'])
     .pipe(sourcemaps.init())
     .pipe(sass().on('error', sass.logError))
+    .pipe(gulpif(function(file) { return bs_select.includes(file.relative);}, con('selects.css')))
     .pipe(postcss([ autoprefixer(), cssnano() ]))
     .pipe(sourcemaps.write())
     .pipe(gulp.dest('pipeline/built_assets/css'))
@@ -35,6 +37,7 @@ function styles(done) {
 function scripts() {
     const dest = 'pipeline/built_assets/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", "autocompleter.js"]
     return gulp.src(['node_modules/jquery/dist/jquery.js',
                     /* JQuery Plugins */
                     'node_modules/jquery-ui-dist/jquery-ui.js',
@@ -57,6 +60,7 @@ function scripts() {
                     'node_modules/konami/konami.js',
                     'pipeline/source_assets/js/**/*.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(ignore.exclude(function(file) { return base_scripts.includes(file.relative);}))
     .pipe(flatten())
     .pipe(terser())