Merge pull request #278 from thec0keman/fix-for-attr-bracket-syntax

Added detection for empty block payloads

lib/parser.pegjs

@@ -60,6 +60,33 @@
     });
   }
 
+  function isArray(obj) {
+    return obj && obj.constructor === Array;
+  }
+
+  // Receives an array object and verifies it has content
+  // Useful for checking blocks to make sure there is actual data in the payload
+  function isArrayWithContent(obj) {
+    if (!isArray(obj))
+      return;
+
+    var hasItems = false;
+    var length = obj.length;
+
+    for (var i = 0; i < length; i++) {
+      var item = obj[i];
+
+      if (isArray(item)) {
+        if (item.length > 0)
+          hasItems = true;
+      } else if (!!item) {
+        hasItems = true;
+      }
+    }
+
+    return hasItems;
+  }
+
   function createBlockOrMustache(mustacheTuple) {
     var mustache   = mustacheTuple[0];
     var block      = mustacheTuple[1] || {};
@@ -90,7 +117,7 @@
       mustacheContent = 'if ' + mustacheContent;
     }
 
-    if (blockTuple && blockTuple.length > 0) {
+    if (isArrayWithContent(blockTuple)) {
       var block = builder.generateBlock(mustacheContent, escaped);
       builder.enter(block);
 

tests/integration/mustaches-test.js

@@ -357,7 +357,7 @@ test('bracketed nested block params', function(){
                  '  \'foo\'',
                  '  something="false" ] as |foo|');
   compilesTo(
-    emblem, '{{#sally \'foo\' something="false" as |foo|}}{{/sally}}');
+    emblem, '{{sally \'foo\' something="false" as |foo|}}');
 });
 
 test('bracketed with block params and block', function(){