From: XhmikosR <xhmikosr@gmail.com>
Date: Mon, 4 Nov 2019 12:44:07 +0000 (+0200)
Subject: Move docs JS one folder up. (#29632)
X-Git-Tag: v5.0.0-alpha1~676
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a28adc76663b00b72abee1ae326b53cc9c9d6b9c;p=thirdparty%2Fbootstrap.git

Move docs JS one folder up. (#29632)
---

diff --git a/package.json b/package.json
index 2b79257786..81315081f2 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "watch-css-main": "nodemon --watch scss/ --ext scss --exec \"npm-run-all css-lint css-compile css-prefix\"",
     "watch-css-docs": "nodemon --watch site/assets/scss/ --ext scss --exec \"npm run css-lint\"",
     "watch-js-main": "nodemon --watch js/src/ --ext js --exec \"npm-run-all js-lint js-compile\"",
-    "watch-js-docs": "nodemon --watch site/assets/js/src/ --ext js --exec \"npm run js-lint\""
+    "watch-js-docs": "nodemon --watch site/assets/js/ --ext js --exec \"npm run js-lint\""
   },
   "style": "dist/css/bootstrap.css",
   "sass": "scss/bootstrap.scss",
diff --git a/site/assets/js/src/application.js b/site/assets/js/application.js
similarity index 100%
rename from site/assets/js/src/application.js
rename to site/assets/js/application.js
diff --git a/site/assets/js/src/search.js b/site/assets/js/search.js
similarity index 100%
rename from site/assets/js/src/search.js
rename to site/assets/js/search.js
diff --git a/site/layouts/partials/scripts.html b/site/layouts/partials/scripts.html
index 0807607e43..a0295741c6 100644
--- a/site/layouts/partials/scripts.html
+++ b/site/layouts/partials/scripts.html
@@ -9,7 +9,7 @@
 {{- end }}
 
 {{- $vendor := resources.Match "js/vendor/*.js" -}}
-{{- $js := resources.Match "js/src/*.js" -}}
+{{- $js := resources.Match "js/*.js" -}}
 {{- $targetDocsJSPath := printf "/docs/%s/assets/js/docs.js" .Site.Params.docs_version -}}
 {{- $docsJs := append $js $vendor | resources.Concat $targetDocsJSPath -}}