From dda5cbcc66306239aebbe01edfaac0c778cc45a2 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Tue, 26 Feb 2019 23:55:26 +0100
Subject: [PATCH] Moved js files to javascripts

Signed-off-by: Jim Martens <github@2martens.de>
---
 _assets/gulp_config/paths.js                          | 2 +-
 _assets/{js => javascripts}/global/echo.js            | 0
 _assets/{js => javascripts}/global/fontawesome-all.js | 0
 _assets/{js => javascripts}/global/main.js            | 6 +++---
 gulpfile.js                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename _assets/{js => javascripts}/global/echo.js (100%)
 rename _assets/{js => javascripts}/global/fontawesome-all.js (100%)
 rename _assets/{js => javascripts}/global/main.js (86%)

diff --git a/_assets/gulp_config/paths.js b/_assets/gulp_config/paths.js
index 6eae9ae..ac5f538 100644
--- a/_assets/gulp_config/paths.js
+++ b/_assets/gulp_config/paths.js
@@ -16,7 +16,7 @@ paths.postFolderName   = "_posts";
 paths.draftFolderName  = "_drafts";
 paths.fontFolderName   = "fonts";
 paths.imageFolderName  = "images";
-paths.scriptFolderName = "js";
+paths.scriptFolderName = "javascripts";
 paths.stylesFolderName = "css";
 
 // Asset files locations.
diff --git a/_assets/js/global/echo.js b/_assets/javascripts/global/echo.js
similarity index 100%
rename from _assets/js/global/echo.js
rename to _assets/javascripts/global/echo.js
diff --git a/_assets/js/global/fontawesome-all.js b/_assets/javascripts/global/fontawesome-all.js
similarity index 100%
rename from _assets/js/global/fontawesome-all.js
rename to _assets/javascripts/global/fontawesome-all.js
diff --git a/_assets/js/global/main.js b/_assets/javascripts/global/main.js
similarity index 86%
rename from _assets/js/global/main.js
rename to _assets/javascripts/global/main.js
index d61bf7e..451d801 100644
--- a/_assets/js/global/main.js
+++ b/_assets/javascripts/global/main.js
@@ -1,7 +1,7 @@
 //= require popper
-//= require bootstrap/util
-//= require bootstrap/collapse
-//= require bootstrap/tooltip
+//= require bootstrap/js/dist/util
+//= require bootstrap/js/dist/collapse
+//= require bootstrap/js/dist/tooltip
 
 "use strict";
 $(function() {
diff --git a/gulpfile.js b/gulpfile.js
index b60e900..00967eb 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -198,7 +198,7 @@ gulp.task("serve", gulp.series("build:local", function () {
     gulp.watch("_assets/styles/**/*.scss", gulp.series("build:styles"));
 
     // Watch .js files.
-    gulp.watch("_assets/js/**/*.js", gulp.series("build:scripts:watch"));
+    gulp.watch("_assets/javascripts/**/*.js", gulp.series("build:scripts:watch"));
 
     // Watch image files; changes are piped to browserSync.
     gulp.watch("_assets/images/**/*", gulp.series("build:images"));