Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add instructions for 'spec/mustache' to CONTRIBUTING.md, fix a few typos #918

Merged
merged 1 commit into from
Dec 8, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion lib/handlebars/compiler/ast.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion lib/handlebars/compiler/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lib/precompiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion spec/precompiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down