github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr/866' into devel

Browse Source
This commit is contained in:
David Glasser
2013-03-22 15:09:46 -07:00
parent bef03af0b2 a6f01b6c92
commit 9dcedace31
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/handlebars/evaluate.js
View File

@@ -28,7 +28,10 @@ Handlebars.json_ast_to_func = function (ast) {
// what is passed in via named arguments.
Handlebars._default_helpers = {
'with': function (data, options) {
return options.fn(data);
if (!data || (data instanceof Array && !data.length))
return options.inverse(this);
else
return options.fn(data);
},
'each': function (data, options) {
var parentData = this;

8
packages/templating/templating_tests.html
View File

@@ -355,3 +355,11 @@
<template name="test_template_issue801">
{{#each values}}{{this}}{{/each}}
</template>
<!-- Test for issue #770 - falsy value for with -->
<template name="test_template_issue770">
{{# with value1}}{{this}}{{else}}xxx{{/with}}
{{# with value2}}{{this}}{{else}}xxx{{/with}}
{{# with value1}}{{this}}{{/with}}
{{# with value2}}{{this}}{{/with}}
</template>

7
packages/templating/templating_tests.js
View File

@@ -1092,3 +1092,10 @@ Tinytest.add('templating - each falsy Issue #801', function (test) {
var frag = Meteor.render(Template.test_template_issue801);
test.equal(canonicalizeHtml(DomUtils.fragmentToHtml(frag)), "12null");
});
Tinytest.add('templating - with falsy Issue #770', function (test) {
Template.test_template_issue770.value1 = function () { return "abc"; };
Template.test_template_issue770.value2 = function () { return false; };
var frag = Meteor.render(Template.test_template_issue770);
test.equal(canonicalizeHtml(DomUtils.fragmentToHtml(frag)), "abcxxxabc");
});