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
ba4206b6
Commit
ba4206b6
authored
11 years ago
by
Zlatan Vasović
Committed by
Chris Rebert
11 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Use different coding style for Gruntfile
Fixes #12657
parent
9afead3f
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
v3.3.0
v3.2.0
v3.1.1
3 merge requests
!28721
Hot test
,
!22103
test
,
!25326
Adjust examples
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
CONTRIBUTING.md
+1
-1
CONTRIBUTING.md
Gruntfile.js
+1
-1
Gruntfile.js
grunt/.jshintrc
+16
-0
grunt/.jshintrc
grunt/bs-glyphicons-data-generator.js
+13
-11
grunt/bs-glyphicons-data-generator.js
grunt/bs-lessdoc-parser.js
+1
-0
grunt/bs-lessdoc-parser.js
grunt/bs-raw-files-generator.js
+13
-14
grunt/bs-raw-files-generator.js
grunt/shrinkwrap.js
+1
-1
grunt/shrinkwrap.js
with
46 additions
and
28 deletions
+46
-28
CONTRIBUTING.md
+
1
-
1
View file @
ba4206b6
...
...
@@ -178,7 +178,7 @@ license your work under the terms of the [MIT License](LICENSE.md).
### JS
-
No semicolons
-
No semicolons
(in client-side JS)
-
2 spaces (no tabs)
-
strict mode
-
"Attractive"
...
...
This diff is collapsed.
Click to expand it.
Gruntfile.js
+
1
-
1
View file @
ba4206b6
...
...
@@ -45,7 +45,7 @@ module.exports = function (grunt) {
},
grunt
:
{
options
:
{
node
:
true
jshintrc
:
'
grunt/.jshintrc
'
},
src
:
[
'
Gruntfile.js
'
,
'
grunt/*.js
'
]
},
...
...
This diff is collapsed.
Click to expand it.
grunt/.jshintrc
0 → 100644
+
16
-
0
View file @
ba4206b6
{
"asi": false,
"camelcase": true,
"curly": true,
"eqeqeq": true,
"immed": true,
"indent": 2,
"newcap": true,
"noarg": true,
"nonbsp": true,
"quotmark": "single",
"undef": true,
"strict": true,
"trailing": true,
"node" : true
}
This diff is collapsed.
Click to expand it.
grunt/bs-glyphicons-data-generator.js
+
13
-
11
View file @
ba4206b6
...
...
@@ -4,29 +4,31 @@
* Copyright 2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
var
fs
=
require
(
'
fs
'
)
'
use strict
'
;
var
fs
=
require
(
'
fs
'
)
;
module
.
exports
=
function
generateGlyphiconsData
()
{
// Pass encoding, utf8, so `readFileSync` will return a string instead of a
// buffer
var
glyphiconsFile
=
fs
.
readFileSync
(
'
less/glyphicons.less
'
,
'
utf8
'
)
var
glpyhiconsLines
=
glyphiconsFile
.
split
(
'
\n
'
)
var
glyphiconsFile
=
fs
.
readFileSync
(
'
less/glyphicons.less
'
,
'
utf8
'
)
;
var
glpyhiconsLines
=
glyphiconsFile
.
split
(
'
\n
'
)
;
// Use any line that starts with ".glyphicon-" and capture the class name
var
iconClassName
=
/^
\.(
glyphicon-
[^\s]
+
)
/
var
iconClassName
=
/^
\.(
glyphicon-
[^\s]
+
)
/
;
var
glyphiconsData
=
'
# This file is generated via Grunt task. **Do not edit directly.**
\n
'
+
'
# See the
\'
build-glyphicons-data
\'
task in Gruntfile.js.
\n\n
'
;
for
(
var
i
=
0
,
len
=
glpyhiconsLines
.
length
;
i
<
len
;
i
++
)
{
var
match
=
glpyhiconsLines
[
i
].
match
(
iconClassName
)
var
match
=
glpyhiconsLines
[
i
].
match
(
iconClassName
)
;
if
(
match
!=
null
)
{
glyphiconsData
+=
'
-
'
+
match
[
1
]
+
'
\n
'
if
(
match
!=
=
null
)
{
glyphiconsData
+=
'
-
'
+
match
[
1
]
+
'
\n
'
;
}
}
// Create the `_data` directory if it doesn't already exist
if
(
!
fs
.
existsSync
(
'
docs/_data
'
))
fs
.
mkdirSync
(
'
docs/_data
'
)
if
(
!
fs
.
existsSync
(
'
docs/_data
'
))
{
fs
.
mkdirSync
(
'
docs/_data
'
);
}
fs
.
writeFileSync
(
'
docs/_data/glyphicons.yml
'
,
glyphiconsData
)
}
fs
.
writeFileSync
(
'
docs/_data/glyphicons.yml
'
,
glyphiconsData
)
;
}
;
This diff is collapsed.
Click to expand it.
grunt/bs-lessdoc-parser.js
+
1
-
0
View file @
ba4206b6
...
...
@@ -4,6 +4,7 @@
* Copyright 2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
'
use strict
'
;
var
markdown
=
require
(
'
markdown
'
).
markdown
;
...
...
This diff is collapsed.
Click to expand it.
grunt/bs-raw-files-generator.js
+
13
-
14
View file @
ba4206b6
/* global btoa: true */
/*!
* Bootstrap Grunt task for generating raw-files.min.js for the Customizer
* http://getbootstrap.com
* Copyright 2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
var
btoa
=
require
(
'
btoa
'
)
var
fs
=
require
(
'
fs
'
)
'
use strict
'
;
var
btoa
=
require
(
'
btoa
'
)
;
var
fs
=
require
(
'
fs
'
)
;
function
getFiles
(
type
)
{
var
files
=
{}
var
files
=
{}
;
fs
.
readdirSync
(
type
)
.
filter
(
function
(
path
)
{
return
type
==
'
fonts
'
?
true
:
new
RegExp
(
'
\\
.
'
+
type
+
'
$
'
).
test
(
path
)
return
type
==
=
'
fonts
'
?
true
:
new
RegExp
(
'
\\
.
'
+
type
+
'
$
'
).
test
(
path
)
;
})
.
forEach
(
function
(
path
)
{
var
fullPath
=
type
+
'
/
'
+
path
return
files
[
path
]
=
(
type
==
'
fonts
'
?
btoa
(
fs
.
readFileSync
(
fullPath
))
:
fs
.
readFileSync
(
fullPath
,
'
utf8
'
))
})
return
'
var __
'
+
type
+
'
=
'
+
JSON
.
stringify
(
files
)
+
'
\n
'
var
fullPath
=
type
+
'
/
'
+
path
;
files
[
path
]
=
(
type
==
=
'
fonts
'
?
btoa
(
fs
.
readFileSync
(
fullPath
))
:
fs
.
readFileSync
(
fullPath
,
'
utf8
'
))
;
})
;
return
'
var __
'
+
type
+
'
=
'
+
JSON
.
stringify
(
files
)
+
'
\n
'
;
}
module
.
exports
=
function
generateRawFilesJs
(
banner
)
{
if
(
!
banner
)
{
banner
=
''
banner
=
''
;
}
var
files
=
banner
+
getFiles
(
'
js
'
)
+
getFiles
(
'
less
'
)
+
getFiles
(
'
fonts
'
)
fs
.
writeFileSync
(
'
docs/assets/js/raw-files.min.js
'
,
files
)
}
var
files
=
banner
+
getFiles
(
'
js
'
)
+
getFiles
(
'
less
'
)
+
getFiles
(
'
fonts
'
)
;
fs
.
writeFileSync
(
'
docs/assets/js/raw-files.min.js
'
,
files
)
;
}
;
This diff is collapsed.
Click to expand it.
grunt/shrinkwrap.js
+
1
-
1
View file @
ba4206b6
...
...
@@ -8,7 +8,7 @@
This Grunt task updates the npm-shrinkwrap.canonical.json file that's used as the key for Bootstrap's npm packages cache.
This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.
*/
'
use strict
'
;
var
canonicallyJsonStringify
=
require
(
'
canonical-json
'
);
var
NON_CANONICAL_FILE
=
'
npm-shrinkwrap.json
'
;
var
DEST_FILE
=
'
test-infra/npm-shrinkwrap.canonical.json
'
;
...
...
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