Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@gmail.com>2020-10-20 10:46:04 +0300
committerXhmikosR <xhmikosr@gmail.com>2020-11-19 21:54:42 +0300
commit50d892167036f440f9224327b0a48cf72a2e44b6 (patch)
treedd3960daeb3fde721792eb4d4cf5b13f8dfe643d
parent3fcfd606f2c264f1d3434e99c140a05edec461c3 (diff)
Adapt to the recent main changes
* remove `bs-custom-file-input.min.js` * switch to errorf * change error message
-rw-r--r--config.yml2
-rw-r--r--site/layouts/partials/func/get-js-assets.html8
2 files changed, 4 insertions, 6 deletions
diff --git a/config.yml b/config.yml
index 48b3bd44c3..eafd87945d 100644
--- a/config.yml
+++ b/config.yml
@@ -48,8 +48,6 @@ module:
## The following vendor files will be bundled together on top of local js files as /docs.js
- source: node_modules/anchor-js/anchor.min.js
target: assets/js/vendor/anchor.min.js
- - source: node_modules/bs-custom-file-input/dist/bs-custom-file-input.min.js
- target: assets/js/vendor/bs-custom-file-input.min.js
- source: node_modules/clipboard/dist/clipboard.min.js
target: assets/js/vendor/clipboard.min.js
diff --git a/site/layouts/partials/func/get-js-assets.html b/site/layouts/partials/func/get-js-assets.html
index a7a27292e7..351e9ad1dc 100644
--- a/site/layouts/partials/func/get-js-assets.html
+++ b/site/layouts/partials/func/get-js-assets.html
@@ -18,7 +18,7 @@
{{ $jsAssets := slice }}
{{/* Storing the reused mount warning message */}}
-{{ $missing_file_warning := "%s not found. Check your mounts settings." }}
+{{ $missing_file_warning := "%s not found. Check your mounts settings and/or run `npm i`." }}
{{ $doc_version := site.Params.docs_version }}
{{/* Doc Search */}}
{{ if eq .Page.Layout "docs" -}}
@@ -31,7 +31,7 @@
*/}}
{{ $jsAssets = $jsAssets | append . }}
{{ else }}
- {{ warnf $missing_file_warning "docsearch.min.js" }}
+ {{ errorf $missing_file_warning "docsearch.min.js" }}
{{ end }}
{{- end }}
@@ -44,12 +44,12 @@
1. Check for missing mounts and throw an error
2. Control order if need be
3. Exclude docsearch (though there would be other ways) */}}
-{{ $vendor_filenames := slice "clipboard.min.js" "anchor.min.js" "bs-custom-file-input.min.js" }}
+{{ $vendor_filenames := slice "clipboard.min.js" "anchor.min.js" }}
{{ range $filename := $vendor_filenames }}
{{ with resources.GetMatch (print "js/vendor/" .) }}
{{ $vendor_assets = $vendor_assets | append . }}
{{ else }}
- {{ warnf $missing_file_warning $filename }}
+ {{ errorf $missing_file_warning $filename }}
{{ end }}
{{ end }}
{{ with $vendor_assets }}