Skip to content

Commit

Permalink
Use different coding style for Gruntfile
Browse files Browse the repository at this point in the history
  • Loading branch information
zlatanvasovic authored and cvrebert committed Feb 10, 2014
1 parent 9afead3 commit ba4206b
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 28 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module.exports = function (grunt) {
},
grunt: {
options: {
node: true
jshintrc: 'grunt/.jshintrc'
},
src: ['Gruntfile.js', 'grunt/*.js']
},
Expand Down
16 changes: 16 additions & 0 deletions grunt/.jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"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
}
24 changes: 13 additions & 11 deletions grunt/bs-glyphicons-data-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};
1 change: 1 addition & 0 deletions grunt/bs-lessdoc-parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
27 changes: 13 additions & 14 deletions grunt/bs-raw-files-generator.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
/* 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);
};
2 changes: 1 addition & 1 deletion grunt/shrinkwrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down

0 comments on commit ba4206b

Please sign in to comment.