Skip to content

Commit

Permalink
Detect helpers with single scalar parameters
Browse files Browse the repository at this point in the history
Adds a check for strings/bools/integer parameters when parsing the
AST. This also filters registered helpers from being reregistered
and registers the $ helper to prevent a failing load for $.js
  • Loading branch information
rosstuck committed Jan 9, 2013
1 parent 6b0a5e0 commit 5b25afb
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions hbs.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ define([
i18nDirectory = "template/i18n/",
buildCSSFileName = "screen.build.css";

Handlebars.registerHelper('$', function() {
//placeholder for translation helper
});

if (typeof window !== "undefined" && window.navigator && window.document && !window.navigator.userAgent.match(/Node.js/)) {
// Browser action
getXhr = function () {
Expand Down Expand Up @@ -225,9 +229,13 @@ define([
var paramsWithoutParts = ['this', '.', '..', './..', '../..', '../../..'];

// grab the params
if ( statement.params ) {
if ( statement.params && typeof Handlebars.helpers[statement.id.string] === 'undefined') {
_(statement.params).forEach(function(param) {
if ( _(paramsWithoutParts).contains(param.original) ) {
if ( _(paramsWithoutParts).contains(param.original)
|| param instanceof Handlebars.AST.StringNode
|| param instanceof Handlebars.AST.IntegerNode
|| param instanceof Handlebars.AST.BooleanNode
) {
helpersres.push(statement.id.string);
}

Expand Down

0 comments on commit 5b25afb

Please sign in to comment.