From ffe646bb08bb14c11492c81ee420595a39d83715 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 7 Apr 2015 13:00:50 -0700 Subject: Sauce tests: upgrade iOS to v8.2 [skip validator] --- grunt/sauce_browsers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grunt') diff --git a/grunt/sauce_browsers.yml b/grunt/sauce_browsers.yml index e48a6f5ba..6267f35a5 100644 --- a/grunt/sauce_browsers.yml +++ b/grunt/sauce_browsers.yml @@ -57,7 +57,7 @@ { browserName: "iphone", platform: "OS X 10.10", - version: "8.1" + version: "8.2" }, # iOS Chrome not currently supported by Sauce Labs -- cgit v1.2.3 From 69308dc883a18f9c2465d8cea8b930e4e1ffda06 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 21 Apr 2015 07:58:52 +0300 Subject: Update Holder.js to v2.6.0. [ci skip] --- grunt/configBridge.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grunt') diff --git a/grunt/configBridge.json b/grunt/configBridge.json index b7080b0c2..8ce4c3d9a 100644 --- a/grunt/configBridge.json +++ b/grunt/configBridge.json @@ -11,7 +11,7 @@ "../assets/js/src/customizer.js" ], "docsJs": [ - "../assets/js/vendor/holder.js", + "../assets/js/vendor/holder.min.js", "../assets/js/vendor/ZeroClipboard.min.js", "../assets/js/vendor/anchor.js", "../assets/js/src/application.js" -- cgit v1.2.3 From 3e7ca3bbc8eaa60013d4ab9f2edd42f6dcd8dd4b Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 26 Apr 2015 13:53:45 +0300 Subject: Minor lint tweaks. --- grunt/bs-commonjs-generator.js | 4 ++-- grunt/bs-glyphicons-data-generator.js | 3 +-- grunt/bs-lessdoc-parser.js | 10 ++++------ grunt/bs-raw-files-generator.js | 12 +++++------- 4 files changed, 12 insertions(+), 17 deletions(-) (limited to 'grunt') 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.'); -- cgit v1.2.3 From 86400070b5a10d4c013f1f8b72d7d170888031fb Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 28 Apr 2015 11:11:49 +0300 Subject: Bump copyright year. [ci skip] --- grunt/bs-commonjs-generator.js | 7 +++++++ grunt/bs-glyphicons-data-generator.js | 4 +++- grunt/bs-lessdoc-parser.js | 3 ++- grunt/bs-raw-files-generator.js | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) (limited to 'grunt') diff --git a/grunt/bs-commonjs-generator.js b/grunt/bs-commonjs-generator.js index 582eefe37..0b4ebbfc1 100644 --- a/grunt/bs-commonjs-generator.js +++ b/grunt/bs-commonjs-generator.js @@ -1,3 +1,10 @@ +/*! + * Bootstrap Grunt task for the CommonJS module generation + * http://getbootstrap.com + * Copyright 2014-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + 'use strict'; var fs = require('fs'); diff --git a/grunt/bs-glyphicons-data-generator.js b/grunt/bs-glyphicons-data-generator.js index 645e4fe2f..af2a82e27 100644 --- a/grunt/bs-glyphicons-data-generator.js +++ b/grunt/bs-glyphicons-data-generator.js @@ -1,10 +1,12 @@ /*! * Bootstrap Grunt task for Glyphicons data generation * http://getbootstrap.com - * Copyright 2014 Twitter, Inc. + * Copyright 2014-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ + 'use strict'; + var fs = require('fs'); module.exports = function generateGlyphiconsData(grunt) { diff --git a/grunt/bs-lessdoc-parser.js b/grunt/bs-lessdoc-parser.js index d196e766a..5a9ed2b3d 100644 --- a/grunt/bs-lessdoc-parser.js +++ b/grunt/bs-lessdoc-parser.js @@ -1,9 +1,10 @@ /*! * Bootstrap Grunt task for parsing Less docstrings * http://getbootstrap.com - * Copyright 2014 Twitter, Inc. + * Copyright 2014-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ + 'use strict'; var Markdown = require('markdown-it'); diff --git a/grunt/bs-raw-files-generator.js b/grunt/bs-raw-files-generator.js index 5e38e634b..39224e4e2 100644 --- a/grunt/bs-raw-files-generator.js +++ b/grunt/bs-raw-files-generator.js @@ -1,7 +1,7 @@ /*! * Bootstrap Grunt task for generating raw-files.min.js for the Customizer * http://getbootstrap.com - * Copyright 2014 Twitter, Inc. + * Copyright 2014-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -- cgit v1.2.3