fix multiple levels of super (fixes mozilla#61)

jlongster · Feb 28, 2013 · 10ac70f · 10ac70f
1 parent b64cdd7
commit 10ac70f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/compiler.js b/src/compiler.js
@@ -633,8 +633,10 @@ var Compiler = Object.extend({
     },
 
     compileBlock: function(node, frame) {
-        this.emitLine(this.buffer + ' += context.getBlock("' +
-                      node.name.value + '")(env, context, frame, runtime);');
+        if(!this.isChild) {
+            this.emitLine(this.buffer + ' += context.getBlock("' +
+                          node.name.value + '")(env, context, frame, runtime);');
+        }
     },
 
     compileExtends: function(node, frame) {
@@ -749,9 +751,9 @@ var Compiler = Object.extend({
 
 // var fs = require("fs");
 // var c = new Compiler();
-// //var src = '{{ foo({a:1}) }}';
+// //var src = '{{ foo({a:1}) }} {% block content %}foo{% endblock %}';
 // var src = '{% extends "base.html" %}' +
-//     '{% block block1 %}{{ super() }}BAR{% endblock %}';
+//     '{% block block1 %}{{ super() }}{% endblock %}';
 
 // var ns = parser.parse(src);
 // nodes.printNodes(ns);

diff --git a/tests/compiler.js b/tests/compiler.js
@@ -305,6 +305,11 @@ describe('compiler', function() {
         var s = render('{% extends "base.html" %}' +
                        '{% block block1 %}{{ super() }}BAR{% endblock %}');
         s.should.equal('FooBarBARBazFizzle');
+
+        // two levels of `super` should work 
+        s = render('{% extends "base-inherit.html" %}' +
+                   '{% block block1 %}*{{ super() }}*{% endblock %}');
+        s.should.equal('Foo**Bar**BazFizzle');
     });
 
     it('should include templates', function() {