aboutsummaryrefslogtreecommitdiff
path: root/grunt
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2015-04-26 13:53:45 +0300
committerXhmikosR <[email protected]>2015-04-28 11:03:37 +0300
commit3e7ca3bbc8eaa60013d4ab9f2edd42f6dcd8dd4b (patch)
tree968eee9693cf578b4f3f2991f4a482019cf4cf43 /grunt
parent4e027718a816f50e9d87acd890644b8f0ecce856 (diff)
downloadbootstrap-3e7ca3bbc8eaa60013d4ab9f2edd42f6dcd8dd4b.tar.xz
bootstrap-3e7ca3bbc8eaa60013d4ab9f2edd42f6dcd8dd4b.zip
Minor lint tweaks.
Diffstat (limited to 'grunt')
-rw-r--r--grunt/bs-commonjs-generator.js4
-rw-r--r--grunt/bs-glyphicons-data-generator.js3
-rw-r--r--grunt/bs-lessdoc-parser.js10
-rw-r--r--grunt/bs-raw-files-generator.js12
4 files changed, 12 insertions, 17 deletions
diff --git a/grunt/bs-commonjs-generator.js b/grunt/bs-commonjs-generator.js
index b0642cd8f..582eefe37 100644
--- a/grunt/bs-commonjs-generator.js
+++ b/grunt/bs-commonjs-generator.js
@@ -1,4 +1,5 @@
'use strict';
+
var fs = require('fs');
var path = require('path');
@@ -15,8 +16,7 @@ module.exports = function generateCommonJSModule(grunt, srcFiles, destFilepath)
var moduleOutputJs = COMMONJS_BANNER + srcFiles.map(srcPathToDestRequire).join('\n');
try {
fs.writeFileSync(destFilepath, moduleOutputJs);
- }
- catch (err) {
+ } catch (err) {
grunt.fail.warn(err);
}
grunt.log.writeln('File ' + destFilepath.cyan + ' created.');
diff --git a/grunt/bs-glyphicons-data-generator.js b/grunt/bs-glyphicons-data-generator.js
index 339fd0ffe..645e4fe2f 100644
--- a/grunt/bs-glyphicons-data-generator.js
+++ b/grunt/bs-glyphicons-data-generator.js
@@ -33,8 +33,7 @@ module.exports = function generateGlyphiconsData(grunt) {
try {
fs.writeFileSync(glyphiconsYml, glyphiconsData);
- }
- catch (err) {
+ } catch (err) {
grunt.fail.warn(err);
}
grunt.log.writeln('File ' + glyphiconsYml.cyan + ' created.');
diff --git a/grunt/bs-lessdoc-parser.js b/grunt/bs-lessdoc-parser.js
index d6be77452..d196e766a 100644
--- a/grunt/bs-lessdoc-parser.js
+++ b/grunt/bs-lessdoc-parser.js
@@ -121,7 +121,7 @@ Tokenizer.prototype._shift = function () {
return new VarDocstring(match[1]);
}
var commentStart = line.lastIndexOf('//');
- var varLine = (commentStart === -1) ? line : line.slice(0, commentStart);
+ var varLine = commentStart === -1 ? line : line.slice(0, commentStart);
match = VAR_ASSIGNMENT.exec(varLine);
if (match !== null) {
return new Variable(match[1], match[2]);
@@ -168,8 +168,7 @@ Parser.prototype.parseSection = function () {
var docstring = this._tokenizer.shift();
if (docstring instanceof SectionDocstring) {
section.docstring = docstring;
- }
- else {
+ } else {
this._tokenizer.unshift(docstring);
}
this.parseSubSections(section);
@@ -185,15 +184,14 @@ Parser.prototype.parseSubSections = function (section) {
// Presume an implicit initial subsection
subsection = new SubSection('');
this.parseVars(subsection);
- }
- else {
+ } else {
break;
}
}
section.addSubSection(subsection);
}
- if (section.subsections.length === 1 && !(section.subsections[0].heading) && section.subsections[0].variables.length === 0) {
+ if (section.subsections.length === 1 && !section.subsections[0].heading && section.subsections[0].variables.length === 0) {
// Ignore lone empty implicit subsection
section.subsections = [];
}
diff --git a/grunt/bs-raw-files-generator.js b/grunt/bs-raw-files-generator.js
index ec8c5314e..5e38e634b 100644
--- a/grunt/bs-raw-files-generator.js
+++ b/grunt/bs-raw-files-generator.js
@@ -5,24 +5,23 @@
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
-/* global btoa: true */
-
'use strict';
+
var fs = require('fs');
var btoa = require('btoa');
var glob = require('glob');
function getFiles(type) {
var files = {};
- var recursive = (type === 'less');
- var globExpr = (recursive ? '/**/*' : '/*');
+ var recursive = type === 'less';
+ var globExpr = recursive ? '/**/*' : '/*';
glob.sync(type + globExpr)
.filter(function (path) {
return type === 'fonts' ? true : new RegExp('\\.' + type + '$').test(path);
})
.forEach(function (fullPath) {
var relativePath = fullPath.replace(/^[^/]+\//, '');
- files[relativePath] = (type === 'fonts' ? btoa(fs.readFileSync(fullPath)) : fs.readFileSync(fullPath, 'utf8'));
+ files[relativePath] = type === 'fonts' ? btoa(fs.readFileSync(fullPath)) : fs.readFileSync(fullPath, 'utf8');
});
return 'var __' + type + ' = ' + JSON.stringify(files) + '\n';
}
@@ -38,8 +37,7 @@ module.exports = function generateRawFilesJs(grunt, banner) {
var rawFilesJs = 'docs/assets/js/raw-files.min.js';
try {
fs.writeFileSync(rawFilesJs, files);
- }
- catch (err) {
+ } catch (err) {
grunt.fail.warn(err);
}
grunt.log.writeln('File ' + rawFilesJs.cyan + ' created.');