diff options
author | Thomas Park <thomas@thomaspark.co> | 2015-06-16 21:40:15 -0400 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.co> | 2015-06-16 21:40:15 -0400 |
commit | ea56c37ca9674f0155448699918650bbfcfbb888 (patch) | |
tree | 12b2d28dc05b533adb55e0ff344c41df36d51301 /bower_components/bootstrap/grunt | |
parent | 06885df3cfbb7d498f59dc5ac61a4cc1cc4f6dc2 (diff) |
update bootstrap to 3.3.5
Diffstat (limited to 'bower_components/bootstrap/grunt')
6 files changed, 27 insertions, 22 deletions
diff --git a/bower_components/bootstrap/grunt/bs-commonjs-generator.js b/bower_components/bootstrap/grunt/bs-commonjs-generator.js index b0642cd8..0b4ebbfc 100644 --- a/bower_components/bootstrap/grunt/bs-commonjs-generator.js +++ b/bower_components/bootstrap/grunt/bs-commonjs-generator.js @@ -1,4 +1,12 @@ +/*! + * 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'); var path = require('path'); @@ -15,8 +23,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/bower_components/bootstrap/grunt/bs-glyphicons-data-generator.js b/bower_components/bootstrap/grunt/bs-glyphicons-data-generator.js index 339fd0ff..af2a82e2 100644 --- a/bower_components/bootstrap/grunt/bs-glyphicons-data-generator.js +++ b/bower_components/bootstrap/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) { @@ -33,8 +35,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/bower_components/bootstrap/grunt/bs-lessdoc-parser.js b/bower_components/bootstrap/grunt/bs-lessdoc-parser.js index d6be7745..5a9ed2b3 100644 --- a/bower_components/bootstrap/grunt/bs-lessdoc-parser.js +++ b/bower_components/bootstrap/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'); @@ -121,7 +122,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 +169,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 +185,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/bower_components/bootstrap/grunt/bs-raw-files-generator.js b/bower_components/bootstrap/grunt/bs-raw-files-generator.js index ec8c5314..39224e4e 100644 --- a/bower_components/bootstrap/grunt/bs-raw-files-generator.js +++ b/bower_components/bootstrap/grunt/bs-raw-files-generator.js @@ -1,28 +1,27 @@ /*! * 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) */ -/* 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.'); diff --git a/bower_components/bootstrap/grunt/configBridge.json b/bower_components/bootstrap/grunt/configBridge.json index b7080b0c..8ce4c3d9 100644 --- a/bower_components/bootstrap/grunt/configBridge.json +++ b/bower_components/bootstrap/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" diff --git a/bower_components/bootstrap/grunt/sauce_browsers.yml b/bower_components/bootstrap/grunt/sauce_browsers.yml index e48a6f5b..6267f35a 100644 --- a/bower_components/bootstrap/grunt/sauce_browsers.yml +++ b/bower_components/bootstrap/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 |