Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Formatting, and remove console.log in tests
  • Loading branch information
larzconwell committed Dec 22, 2012
1 parent 875bfb2 commit 902e262
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 deletions.
15 changes: 7 additions & 8 deletions lib/template/adapters/handlebars.js
Expand Up @@ -76,25 +76,24 @@ Handlebars.prototype.registerHelpers = function (helpers) {
*/ */


Handlebars.prototype.wrapOptions = function (helper) { Handlebars.prototype.wrapOptions = function (helper) {
return function() { return function () {
var argsLen = arguments.length, var argsLen = arguments.length
options = argsLen ? arguments[argsLen - 1] : null, , options = argsLen ? arguments[argsLen - 1] : null
i = 0 , newArgs; , i, newArgs;


if (options && options.hash) { if (options && options.hash) {
newArgs = []; newArgs = [];


for (;i<argsLen - 1; i++) { for (i = 0; i<argsLen - 1; i++) {
newArgs.push(arguments[i]); newArgs.push(arguments[i]);
} }


newArgs.push(options.hash); newArgs.push(options.hash);
return helper.apply(this, newArgs); return helper.apply(this, newArgs);
} } else {
else {
return helper.apply(this, arguments); return helper.apply(this, arguments);
} }
} }
} }


module.exports = Handlebars; module.exports = Handlebars;
16 changes: 9 additions & 7 deletions test/templates/engines/handlebars_mustache.js
Expand Up @@ -80,18 +80,20 @@ tests = {
var html = '<p>foo</p>', var html = '<p>foo</p>',
str = '<p>{{#items}}{{foo}}{{/items}}</p>'; str = '<p>{{#items}}{{foo}}{{/items}}</p>';
assert.equal(html, render(str, {items: [{foo: 'foo'}]})); assert.equal(html, render(str, {items: [{foo: 'foo'}]}));
}, }


'test hash arguments' : function () { , 'test hash arguments' : function () {
var html = 'foobar.com/main/index' var html = 'foobar.com/main/index'
, tpl = "{{url host='foobar.com' controller='main' action='index'}}" , tpl = "{{url host='foobar.com' controller='main' action='index'}}"
, helper = function(options) { , helper, adapter;
console.log(options);
return options.host + '/' + options.controller + '/' + options.action helper = function (options) {
} return options.host + '/' + options.controller + '/' + options.action
};


var adapter = new Adapter({engine: 'handlebars', template: tpl}); adapter = new Adapter({engine: 'handlebars', template: tpl});
adapter.registerHelper('url', helper); adapter.registerHelper('url', helper);

assert.equal(html, adapter.render()); assert.equal(html, adapter.render());
} }


Expand Down

0 comments on commit 902e262

Please sign in to comment.