mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-18 03:11:19 +02:00
Code Issues Releases Wiki Activity

Adapt to the recent main changes

Browse Source 
* remove `bs-custom-file-input.min.js`
* switch to errorf
* change error message
This commit is contained in:
XhmikosR
2020-10-20 10:46:04 +03:00
parent 3fcfd606f2
commit 50d8921670
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.yml
View File

@@ -48,8 +48,6 @@ module:
## The following vendor files will be bundled together on top of local js files as /docs.js ## 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 - source: node_modules/anchor-js/anchor.min.js
target: assets/js/vendor/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 - source: node_modules/clipboard/dist/clipboard.min.js
target: assets/js/vendor/clipboard.min.js target: assets/js/vendor/clipboard.min.js

8
site/layouts/partials/func/get-js-assets.html
View File

@@ -18,7 +18,7 @@
{{ $jsAssets := slice }} {{ $jsAssets := slice }}
{{/* Storing the reused mount warning message */}} {{/* 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_version := site.Params.docs_version }}
{{/* Doc Search */}} {{/* Doc Search */}}
{{ if eq .Page.Layout "docs" -}} {{ if eq .Page.Layout "docs" -}}
@@ -31,7 +31,7 @@
*/}} */}}
{{ $jsAssets = $jsAssets | append . }} {{ $jsAssets = $jsAssets | append . }}
{{ else }} {{ else }}
{{ warnf $missing_file_warning "docsearch.min.js" }} {{ errorf $missing_file_warning "docsearch.min.js" }}
{{ end }} {{ end }}
{{- end }} {{- end }}
@@ -44,12 +44,12 @@
1. Check for missing mounts and throw an error 1. Check for missing mounts and throw an error
2. Control order if need be 2. Control order if need be
3. Exclude docsearch (though there would be other ways) */}} 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 }} {{ range $filename := $vendor_filenames }}
{{ with resources.GetMatch (print "js/vendor/" .) }} {{ with resources.GetMatch (print "js/vendor/" .) }}
{{ $vendor_assets = $vendor_assets | append . }} {{ $vendor_assets = $vendor_assets | append . }}
{{ else }} {{ else }}
{{ warnf $missing_file_warning $filename }} {{ errorf $missing_file_warning $filename }}
{{ end }} {{ end }}
{{ end }} {{ end }}
{{ with $vendor_assets }} {{ with $vendor_assets }}