diff options
author | Kevin Decker <kpdecker@gmail.com> | 2014-12-08 11:39:22 -0800 |
---|---|---|
committer | Kevin Decker <kpdecker@gmail.com> | 2014-12-08 11:39:22 -0800 |
commit | ae8c1d229f03558adec418bce6034bf27dcb9d67 (patch) | |
tree | fd5aca6878fa0e01515340621feb90644a357241 | |
parent | 3238645f260a77b02baa9b686cf7d5de3a7d2694 (diff) | |
parent | e7f51c2248340461ce0cdc5790f6af0203f4f1c4 (diff) | |
download | handlebars.js-ae8c1d229f03558adec418bce6034bf27dcb9d67.zip handlebars.js-ae8c1d229f03558adec418bce6034bf27dcb9d67.tar.gz handlebars.js-ae8c1d229f03558adec418bce6034bf27dcb9d67.tar.bz2 |
Merge pull request #918 from oneeman/submodule-instr-in-contributing
Add instructions for 'spec/mustache' to CONTRIBUTING.md, fix a few typos
-rw-r--r-- | CONTRIBUTING.md | 2 | ||||
-rw-r--r-- | lib/handlebars/compiler/ast.js | 2 | ||||
-rw-r--r-- | lib/handlebars/compiler/base.js | 2 | ||||
-rw-r--r-- | lib/precompiler.js | 2 | ||||
-rw-r--r-- | spec/precompiler.js | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4c5256b..b84fdb0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,6 +28,8 @@ To build Handlebars.js you'll need a few things installed. * Node.js * [Grunt](http://gruntjs.com/getting-started) +Before building, you need to make sure that the Git submodule `spec/mustache` is included (i.e. the directory `spec/mustache` should not be empty). To include it, if using Git version 1.6.5 or newer, use `git clone --recursive` rather than `git clone`. Or, if you already cloned without `--recursive`, use `git submodule update --init`. + Project dependencies may be installed via `npm install`. To build Handlebars.js from scratch, you'll want to run `grunt` diff --git a/lib/handlebars/compiler/ast.js b/lib/handlebars/compiler/ast.js index 72a56aa..0020216 100644 --- a/lib/handlebars/compiler/ast.js +++ b/lib/handlebars/compiler/ast.js @@ -111,5 +111,5 @@ var AST = { // Must be exported as an object rather than the root of the module as the jison lexer -// most modify the object to operate properly. +// must modify the object to operate properly. export default AST; diff --git a/lib/handlebars/compiler/base.js b/lib/handlebars/compiler/base.js index ff237ec..167b844 100644 --- a/lib/handlebars/compiler/base.js +++ b/lib/handlebars/compiler/base.js @@ -10,7 +10,7 @@ var yy = {}; extend(yy, Helpers, AST); export function parse(input, options) { - // Just return if an already-compile AST was passed in. + // Just return if an already-compiled AST was passed in. if (input.type === 'Program') { return input; } parser.yy = yy; diff --git a/lib/precompiler.js b/lib/precompiler.js index 165c008..64a6dab 100644 --- a/lib/precompiler.js +++ b/lib/precompiler.js @@ -27,7 +27,7 @@ module.exports.cli = function(opts) { }); if (opts.simple && opts.min) { - throw new Handlebars.Exception('Unable to minimze simple output'); + throw new Handlebars.Exception('Unable to minimize simple output'); } if (opts.simple && (opts.templates.length !== 1 || fs.statSync(opts.templates[0]).isDirectory())) { throw new Handlebars.Exception('Unable to output multiple templates in simple mode'); diff --git a/spec/precompiler.js b/spec/precompiler.js index c56bee6..cbbfdf7 100644 --- a/spec/precompiler.js +++ b/spec/precompiler.js @@ -61,7 +61,7 @@ describe('precompiler', function() { it('should throw when combining simple and minimized', function() { shouldThrow(function() { Precompiler.cli({templates: [__dirname], simple: true, min: true}); - }, Handlebars.Exception, 'Unable to minimze simple output'); + }, Handlebars.Exception, 'Unable to minimize simple output'); }); it('should throw when combining simple and multiple templates', function() { shouldThrow(function() { |