Skip to content
GitLab
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
1afc0eec
Commit
1afc0eec
authored
10 years ago
by
Chris Rebert
Browse files
Options
Download
Email Patches
Plain Diff
Move stuff out of configBridge.json now that the Customizer is kaput
parent
7d8bad58
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Gruntfile.js
+19
-3
Gruntfile.js
grunt/configBridge.json
+0
-25
grunt/configBridge.json
with
19 additions
and
28 deletions
+19
-28
Gruntfile.js
+
19
-
3
View file @
1afc0eec
...
@@ -38,8 +38,15 @@ module.exports = function (grunt) {
...
@@ -38,8 +38,15 @@ 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
'
,
jqueryCheck
:
configBridge
.
config
.
jqueryCheck
.
join
(
'
\n
'
),
jqueryCheck
:
'
if (typeof jQuery ===
\'
undefined
\'
) {
\n
'
+
jqueryVersionCheck
:
configBridge
.
config
.
jqueryVersionCheck
.
join
(
'
\n
'
),
'
throw new Error(
\'
Bootstrap
\\\'
s JavaScript requires jQuery
\'
)
\n
'
+
'
}
\n
'
,
jqueryVersionCheck
:
'
+function ($) {
\n
'
+
'
var version = $.fn.jquery.split(
\'
\'
)[0].split(
\'
.
\'
)
\n
'
+
'
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {
\n
'
+
'
throw new Error(
\'
Bootstrap
\\\'
s JavaScript requires jQuery version 1.9.1 or higher
\'
)
\n
'
+
'
}
\n
'
+
'
}(jQuery);
\n\n
'
,
// Task configuration.
// Task configuration.
clean
:
{
clean
:
{
...
@@ -166,7 +173,16 @@ module.exports = function (grunt) {
...
@@ -166,7 +173,16 @@ module.exports = function (grunt) {
autoprefixer
:
{
autoprefixer
:
{
options
:
{
options
:
{
browsers
:
configBridge
.
config
.
autoprefixerBrowsers
browsers
:
[
'
Android 2.3
'
,
'
Android >= 4
'
,
'
Chrome >= 20
'
,
'
Firefox >= 31
'
,
'
Explorer >= 9
'
,
'
iOS >= 6
'
,
'
Opera >= 12
'
,
'
Safari >= 6
'
]
},
},
core
:
{
core
:
{
options
:
{
options
:
{
...
...
This diff is collapsed.
Click to expand it.
grunt/configBridge.json
+
0
-
25
View file @
1afc0eec
...
@@ -5,30 +5,5 @@
...
@@ -5,30 +5,5 @@
"../assets/js/vendor/ZeroClipboard.min.js"
,
"../assets/js/vendor/ZeroClipboard.min.js"
,
"../assets/js/src/application.js"
"../assets/js/src/application.js"
]
]
},
"config"
:
{
"autoprefixerBrowsers"
:
[
"Android 2.3"
,
"Android >= 4"
,
"Chrome >= 20"
,
"Firefox >= 31"
,
"Explorer >= 9"
,
"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
"
]
}
}
}
}
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