Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
d1070042
Commit
d1070042
authored
10 years ago
by
Heinrich Fenkart
Browse files
Options
Download
Email Patches
Plain Diff
Remove duplicate code from Customizer/Gruntfile by sharing it
parent
203912b9
main
cleanup-floating-forms
cssvar-function
dependabot/npm_and_yarn/stylelint-and-stylelint-config-twbs-bootstrap-15.3.0
extend-snippets
feat/data-target
floating-always-visible
floating-labels-icons
fod-main-banner
form-controls-with-icons
github/fork/719media/patch-13
github/fork/719media/patch-14
github/fork/719media/patch-9
github/fork/ChellyAhmed/fix-typo-reboot.md
github/fork/ChellyAhmed/offcanvas-scroll-back
github/fork/CtrlAltLilith/main
github/fork/Elysiome/offcanvas-optional-window-resizing
github/fork/JanSargsyan/main
github/fork/LunicLynx/support-different-line-height-for-buttons
github/fork/Psixodelik/main
github/fork/Ronid1/ronid1/offcanvas_static_backdrop
github/fork/RyanBerliner/tooltip-accessibility
github/fork/SantiagoPVazquez/Feature-default-border-bottom-to-dropdown-item
github/fork/Sir-Genius/utils
github/fork/Sumit-Singh-8/main
github/fork/Viktor-VERA2020/offcanvas-slide
github/fork/Zivangu9/input-group-for-form-control-plaintext
github/fork/alpadev/alpadev/call-dispose-on-component-reinstantiation
github/fork/astagi/fix/tree-shake-modules
github/fork/compnerd/dark-accordion-icon
github/fork/derSascha/dropdown-dont-close-on-input-click
github/fork/dev-ph1l/main
github/fork/donquixote/issue-33861-utl-mixin
github/fork/florianlacreuse/mixin-make-row-gutter-y
github/fork/gregorw/main
github/fork/iteggmbh/transitionend-dispose-race
github/fork/jdelStrother/patch-1
github/fork/jonnysp/form-floating
github/fork/jonnysp/independent-offcanvas
github/fork/jonnysp/theme-dark-on-card-and-modal-fix
github/fork/josefdlange/floating-label-placeholder-opacity
github/fork/julien-deramond/enhance-change-version.js
github/fork/julien-deramond/main-jd-fix-offset-content
github/fork/julien-deramond/main-jd-issue-with-utitlies
github/fork/julien-deramond/main-xmr-pa11y-ci-jd-add-hideElements
github/fork/kyletsang/fix-tooltip-padding
github/fork/lacutah/CheckboxCenteringDocumentation
github/fork/lekoala/patch-3
github/fork/louismaximepiton/main-kld-lmp-collapse-proposal
github/fork/louismaximepiton/main-lmp-card-inner-border-radius-fix
github/fork/louismaximepiton/main-lmp-carousel-multiple-images
github/fork/louismaximepiton/main-lmp-css-var-init
github/fork/louismaximepiton/main-lmp-disabled-floating-label-fix
github/fork/louismaximepiton/main-lmp-input-range-fix
github/fork/louismaximepiton/main-lmp-shift-color
github/fork/louismaximepiton/main-lmp-table-active-tr-fix
github/fork/maciek-szn/switch
github/fork/michael-roth/feature/19964-multiple-tab-targets
github/fork/mistic100/dom-utils
github/fork/nkdas91/accordion
github/fork/nstungcom/fix-missing-modal-open-class
github/fork/oraliahdz/animation-utilities
github/fork/pine3ree/patch-7
github/fork/pouwerkerk/unindent-scss-docs-shortcode
github/fork/smares/smares-no-scolling-on-modal-close
github/fork/tgm-git/patch-1
gs-forms
gs-toasts-with-animated-progress-bar
gs/add-history-helper
gs/change-version-dir-on-docs
gs/data-must-set-onlu-one-instance
gs/docs/fix-drop-down-error
gs/event-handler-2
gs/make-docs-js-build
gs/make-simple-attribute-toggler
gs/popover-fix-doc
gs/provide-steConfig-method
gs/scrollspy-smoothscroll-option-use-browser-history
gs/streamline-jqueryInterface
gs/support-drop-down-in-navbar
gs/test-js-generic-trigger
gs/try-web-components
gs/tweak-collapse-js-selector
gs/use-event-handler-in-cocmponent
gs/use-rollup-replace-for-version
jo-docs-thanks-page
jo-ssr-friendly
logical-props-spacing-utils
main-fod-disabled-form-check-label
main-fod-nested-accordion
main-fod-simpler-table-structure
main-fod-table-separator
main-fod-utilities-contrast
main-jd-abbr-title
main-jd-add-chips
main-jd-add-doc-for-sass-custom-colors
main-jd-add-enable-host-to-handle-web-components
main-jd-browserstack-fine-tune
main-jd-browserstack-updates
main-jd-docs-consistent-usage-of-css-sections-step-2
main-jd-fix-docs-headers-in-white
main-jd-fix-highlight-docs-border-radius
main-jd-fix-placeholder-color-background-params-for-img-markup
main-jd-glossary-experiment
main-jd-postcss-drop-empty-css-vars
main-jd-proto-doc-astro
main-jd-skip-navigation-component
main-jd-stackblitz-for-examples
main-jd-upgrade-browserlistrc
main-jd-use-host
main-lmp-dark-theme-customization
main-lmp-handle-scroll-target
main-lmp-tab-fix
main-mc-opensearch
main-xmr-bundlewatch-action
main-xmr-eslint-plugin-compat
main-xmr-hugo-docs-vendor
main-xmr-hugo-rm-ver
main-xmr-linkinator-prod
main-xmr-min-mangle
main-xmr-pa11y-ci
more-darkmode-examples
nested-dropdowns
patrickhlauke-issue37428
patrickhlauke-use-of-color-tweaks
pr/34102
pr/37590
previous-next-docs-links
sticky-thead
utilities-functions-mixin
v3-dev
v4-dev
v4-dev-dropdown-hide-method
v530-dev
v6-postcss-custom-media
v6-spinner-dots
v6/gs/use-floating-ui-in-place-of-popper
xmr/dev
xmr/docs-png
xmr/docs-svgs
xmr/hugo-reorg-files
xmr/js-2
xmr/markdownlint
xmr/prepare-530-alpha2
xmr/xo
v5.3.0-alpha1
v5.2.3
v5.2.2
v5.2.1
v5.2.0
v5.2.0-beta1
v5.1.3
v5.1.2
v5.1.1
v5.1.0
v5.0.2
v5.0.1
v5.0.0
v5.0.0-beta3
v5.0.0-beta2
v5.0.0-beta1
v5.0.0-alpha3
v5.0.0-alpha2
v5.0.0-alpha1
v4.6.2
v4.6.1
v4.6.0
v4.5.3
v4.5.2
v4.5.1
v4.5.0
v4.4.1
v4.4.0
v4.3.1
v4.3.0
v4.2.1
v4.2.0
v4.1.3
v4.1.2
v4.1.1
v4.1.0
v4.0.0
v4.0.0-beta.3
v4.0.0-beta.2
v4.0.0-beta
v4.0.0-alpha.6
v4.0.0-alpha.5
v4.0.0-alpha.4
v4.0.0-alpha.3
v4.0.0-alpha.2
v4.0.0-alpha
v3.4.1
v3.4.0
v3.3.7
v3.3.6
v3.3.5
v3.3.4
v3.3.2
v3.3.1
5 merge requests
!28721
Hot test
,
!14982
Remove duplicate code from Customizer/Gruntfile by sharing it
,
!16605
Test pull please ignore
,
!22103
test
,
!25326
Adjust examples
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitignore
+1
-0
.gitignore
Gruntfile.js
+17
-42
Gruntfile.js
docs/_includes/footer.html
+7
-13
docs/_includes/footer.html
docs/assets/js/src/customizer.js
+4
-15
docs/assets/js/src/customizer.js
grunt/configBridge.json
+44
-0
grunt/configBridge.json
with
73 additions
and
70 deletions
+73
-70
.gitignore
+
1
-
0
View file @
d1070042
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
_gh_pages
_gh_pages
_site
_site
.ruby-version
.ruby-version
docs/_data/configBridge.json
# Numerous always-ignore extensions
# Numerous always-ignore extensions
*.diff
*.diff
...
...
This diff is collapsed.
Click to expand it.
Gruntfile.js
+
17
-
42
View file @
d1070042
...
@@ -27,6 +27,13 @@ module.exports = function (grunt) {
...
@@ -27,6 +27,13 @@ module.exports = function (grunt) {
};
};
var
generateRawFiles
=
require
(
'
./grunt/bs-raw-files-generator.js
'
);
var
generateRawFiles
=
require
(
'
./grunt/bs-raw-files-generator.js
'
);
var
generateCommonJSModule
=
require
(
'
./grunt/bs-commonjs-generator.js
'
);
var
generateCommonJSModule
=
require
(
'
./grunt/bs-commonjs-generator.js
'
);
var
configBridge
=
grunt
.
file
.
readJSON
(
'
./grunt/configBridge.json
'
,
{
encoding
:
'
utf8
'
});
Object
.
keys
(
configBridge
.
paths
).
forEach
(
function
(
key
)
{
configBridge
.
paths
[
key
].
forEach
(
function
(
val
,
i
,
arr
)
{
arr
[
i
]
=
path
.
join
(
'
./docs/assets
'
,
val
);
});
});
// Project configuration.
// Project configuration.
grunt
.
initConfig
({
grunt
.
initConfig
({
...
@@ -38,21 +45,8 @@ module.exports = function (grunt) {
...
@@ -38,21 +45,8 @@ module.exports = function (grunt) {
'
* Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>
\n
'
+
'
* Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>
\n
'
+
'
* Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)
\n
'
+
'
* Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)
\n
'
+
'
*/
\n
'
,
'
*/
\n
'
,
// NOTE: This jqueryCheck/jqueryVersionCheck code is duplicated in customizer.js;
jqueryCheck
:
configBridge
.
config
.
jqueryCheck
.
join
(
'
\n
'
),
// if making changes here, be sure to update the other copy too.
jqueryVersionCheck
:
configBridge
.
config
.
jqueryVersionCheck
.
join
(
'
\n
'
),
jqueryCheck
:
[
'
if (typeof jQuery ===
\'
undefined
\'
) {
'
,
'
throw new Error(
\'
Bootstrap
\\\'
s JavaScript requires jQuery
\'
)
'
,
'
}
\n
'
].
join
(
'
\n
'
),
jqueryVersionCheck
:
[
'
+function ($) {
'
,
'
var version = $.fn.jquery.split(
\'
\'
)[0].split(
\'
.
\'
)
'
,
'
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {
'
,
'
throw new Error(
\'
Bootstrap
\\\'
s JavaScript requires jQuery version 1.9.1 or higher
\'
)
'
,
'
}
'
,
'
}(jQuery);
\n\n
'
].
join
(
'
\n
'
),
// Task configuration.
// Task configuration.
clean
:
{
clean
:
{
...
@@ -138,25 +132,11 @@ module.exports = function (grunt) {
...
@@ -138,25 +132,11 @@ module.exports = function (grunt) {
dest
:
'
dist/js/<%= pkg.name %>.min.js
'
dest
:
'
dist/js/<%= pkg.name %>.min.js
'
},
},
customize
:
{
customize
:
{
// NOTE: This src list is duplicated in footer.html; if making changes here, be sure to update the other copy too.
src
:
configBridge
.
paths
.
customizerJs
,
src
:
[
'
docs/assets/js/vendor/less.min.js
'
,
'
docs/assets/js/vendor/jszip.min.js
'
,
'
docs/assets/js/vendor/uglify.min.js
'
,
'
docs/assets/js/vendor/Blob.js
'
,
'
docs/assets/js/vendor/FileSaver.js
'
,
'
docs/assets/js/raw-files.min.js
'
,
'
docs/assets/js/src/customizer.js
'
],
dest
:
'
docs/assets/js/customize.min.js
'
dest
:
'
docs/assets/js/customize.min.js
'
},
},
docsJs
:
{
docsJs
:
{
// NOTE: This src list is duplicated in footer.html; if making changes here, be sure to update the other copy too.
src
:
configBridge
.
paths
.
docsJs
,
src
:
[
'
docs/assets/js/vendor/holder.js
'
,
'
docs/assets/js/vendor/ZeroClipboard.min.js
'
,
'
docs/assets/js/src/application.js
'
],
dest
:
'
docs/assets/js/docs.min.js
'
dest
:
'
docs/assets/js/docs.min.js
'
}
}
},
},
...
@@ -195,16 +175,7 @@ module.exports = function (grunt) {
...
@@ -195,16 +175,7 @@ module.exports = function (grunt) {
autoprefixer
:
{
autoprefixer
:
{
options
:
{
options
:
{
browsers
:
[
browsers
:
configBridge
.
config
.
autoprefixerBrowsers
'
Android 2.3
'
,
'
Android >= 4
'
,
'
Chrome >= 20
'
,
'
Firefox >= 24
'
,
// Firefox 24 is the latest ESR
'
Explorer >= 8
'
,
'
iOS >= 6
'
,
'
Opera >= 12
'
,
'
Safari >= 6
'
]
},
},
core
:
{
core
:
{
options
:
{
options
:
{
...
@@ -312,6 +283,10 @@ module.exports = function (grunt) {
...
@@ -312,6 +283,10 @@ module.exports = function (grunt) {
docs
:
{
docs
:
{
src
:
'
dist/*/*
'
,
src
:
'
dist/*/*
'
,
dest
:
'
docs/
'
dest
:
'
docs/
'
},
configBridge
:
{
src
:
'
grunt/configBridge.json
'
,
dest
:
'
docs/_data/configBridge.json
'
}
}
},
},
...
@@ -482,7 +457,7 @@ module.exports = function (grunt) {
...
@@ -482,7 +457,7 @@ module.exports = function (grunt) {
grunt
.
registerTask
(
'
lint-docs-css
'
,
[
'
csslint:docs
'
,
'
csslint:examples
'
]);
grunt
.
registerTask
(
'
lint-docs-css
'
,
[
'
csslint:docs
'
,
'
csslint:examples
'
]);
grunt
.
registerTask
(
'
docs-js
'
,
[
'
uglify:docsJs
'
,
'
uglify:customize
'
]);
grunt
.
registerTask
(
'
docs-js
'
,
[
'
uglify:docsJs
'
,
'
uglify:customize
'
]);
grunt
.
registerTask
(
'
lint-docs-js
'
,
[
'
jshint:assets
'
,
'
jscs:assets
'
]);
grunt
.
registerTask
(
'
lint-docs-js
'
,
[
'
jshint:assets
'
,
'
jscs:assets
'
]);
grunt
.
registerTask
(
'
docs
'
,
[
'
docs-css
'
,
'
lint-docs-css
'
,
'
docs-js
'
,
'
lint-docs-js
'
,
'
clean:docs
'
,
'
copy:docs
'
,
'
build-customizer
'
]);
grunt
.
registerTask
(
'
docs
'
,
[
'
docs-css
'
,
'
lint-docs-css
'
,
'
docs-js
'
,
'
lint-docs-js
'
,
'
clean:docs
'
,
'
copy:docs
'
,
'
copy:configBridge
'
,
'
build-customizer
'
]);
// Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json).
// Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json).
// This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.
// This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.
...
...
This diff is collapsed.
Click to expand it.
docs/_includes/footer.html
+
7
-
13
View file @
d1070042
...
@@ -43,25 +43,19 @@
...
@@ -43,25 +43,19 @@
{% if site.github %}
{% if site.github %}
<script
src=
"../assets/js/docs.min.js"
></script>
<script
src=
"../assets/js/docs.min.js"
></script>
{% else %}
{% else %}
<script
src=
"../assets/js/vendor/holder.js"
></script>
{% for file in site.data.configBridge.paths.docsJs %}
<script
src=
"
../assets/js/vendor/ZeroClipboard.min.js
"
></script>
<script
src=
"
{{ file }}
"
></script>
<script
src=
"../assets/js/src/application.js"
></script>
{% endfor %}
{% endif %}
{% endif %}
{% if page.slug == "customize" %}
{% if page.slug == "customize" %}
<script>
var
__configBridge
=
{{
site
.
data
.
configBridge
.
config
|
jsonify
}}
</script>
{% if site.github %}
{% if site.github %}
<script
src=
"../assets/js/customize.min.js"
></script>
<script
src=
"../assets/js/customize.min.js"
></script>
{% else %}
{% else %}
{% comment %}
{% for file in site.data.configBridge.paths.customizerJs %}
This list is repeated in our Gruntfile—update both when making changes.
<script
src=
"{{ file }}"
></script>
{% endcomment %}
{% endfor %}
<script
src=
"../assets/js/vendor/less.min.js"
></script>
<script
src=
"../assets/js/vendor/jszip.min.js"
></script>
<script
src=
"../assets/js/vendor/uglify.min.js"
></script>
<script
src=
"../assets/js/vendor/Blob.js"
></script>
<script
src=
"../assets/js/vendor/FileSaver.js"
></script>
<script
src=
"../assets/js/raw-files.min.js"
></script>
<script
src=
"../assets/js/src/customizer.js"
></script>
{% endif %}
{% endif %}
{% endif %}
{% endif %}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/src/customizer.js
+
4
-
15
View file @
d1070042
...
@@ -6,13 +6,13 @@
...
@@ -6,13 +6,13 @@
* details, see http://creativecommons.org/licenses/by/3.0/.
* details, see http://creativecommons.org/licenses/by/3.0/.
*/
*/
/* global JSZip, less, saveAs, UglifyJS, __js, __less, __fonts */
/* global JSZip, less, saveAs, UglifyJS,
__configBridge,
__js, __less, __fonts */
window
.
onload
=
function
()
{
// wait for load in a dumb way because B-0
window
.
onload
=
function
()
{
// wait for load in a dumb way because B-0
'
use strict
'
;
'
use strict
'
;
var
cw
=
'
/*!
\n
'
+
var
cw
=
'
/*!
\n
'
+
'
* Bootstrap v3.3.0 (http://getbootstrap.com)
\n
'
+
'
* Bootstrap v3.3.0 (http://getbootstrap.com)
\n
'
+
'
* Copyright 2011-
2014
Twitter, Inc.
\n
'
+
'
* Copyright 2011-
'
+
new
Date
().
getFullYear
()
+
'
Twitter, Inc.
\n
'
+
'
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
\n
'
+
'
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
\n
'
+
'
*/
\n\n
'
'
*/
\n\n
'
...
@@ -319,19 +319,8 @@ window.onload = function () { // wait for load in a dumb way because B-0
...
@@ -319,19 +319,8 @@ window.onload = function () { // wait for load in a dumb way because B-0
function
generateJS
(
preamble
)
{
function
generateJS
(
preamble
)
{
var
$checked
=
$
(
'
#plugin-section input:checked
'
)
var
$checked
=
$
(
'
#plugin-section input:checked
'
)
var
jqueryCheck
=
[
var
jqueryCheck
=
__configBridge
.
jqueryCheck
.
join
(
'
\n
'
)
'
if (typeof jQuery ===
\'
undefined
\'
) {
'
,
var
jqueryVersionCheck
=
__configBridge
.
jqueryVersionCheck
.
join
(
'
\n
'
)
'
throw new Error(
\'
Bootstrap
\\\'
s JavaScript requires jQuery
\'
)
'
,
'
}
\n
'
].
join
(
'
\n
'
)
var
jqueryVersionCheck
=
[
'
+function ($) {
'
,
'
var version = $.fn.jquery.split(
\'
\'
)[0].split(
\'
.
\'
)
'
,
'
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {
'
,
'
throw new Error(
\'
Bootstrap
\\\'
s JavaScript requires jQuery version 1.9.1 or higher
\'
)
'
,
'
}
'
,
'
}(jQuery);
\n\n
'
].
join
(
'
\n
'
)
if
(
!
$checked
.
length
)
return
false
if
(
!
$checked
.
length
)
return
false
...
...
This diff is collapsed.
Click to expand it.
grunt/configBridge.json
0 → 100644
+
44
-
0
View file @
d1070042
{
"paths"
:
{
"customizerJs"
:
[
"../assets/js/vendor/autoprefixer.js"
,
"../assets/js/vendor/less.min.js"
,
"../assets/js/vendor/jszip.min.js"
,
"../assets/js/vendor/uglify.min.js"
,
"../assets/js/vendor/Blob.js"
,
"../assets/js/vendor/FileSaver.js"
,
"../assets/js/raw-files.min.js"
,
"../assets/js/src/customizer.js"
],
"docsJs"
:
[
"../assets/js/vendor/holder.js"
,
"../assets/js/vendor/ZeroClipboard.min.js"
,
"../assets/js/src/application.js"
]
},
"config"
:
{
"autoprefixerBrowsers"
:
[
"Android 2.3"
,
"Android >= 4"
,
"Chrome >= 20"
,
"Firefox >= 24"
,
"Explorer >= 8"
,
"iOS >= 6"
,
"Opera >= 12"
,
"Safari >= 6"
],
"jqueryCheck"
:
[
"if (typeof jQuery === 'undefined') {"
,
" throw new Error('Bootstrap
\\
's JavaScript requires jQuery')"
,
"}
\n
"
],
"jqueryVersionCheck"
:
[
"+function ($) {"
,
" var version = $.fn.jquery.split(' ')[0].split('.')"
,
" if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {"
,
" throw new Error('Bootstrap
\\
's JavaScript requires jQuery version 1.9.1 or higher')"
,
" }"
,
"}(jQuery);
\n\n
"
]
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets