Merge pull request #774 from geeqie/master

Issue with including multiple extends of the common ancestor solved (#699)

lib/parser.js

@@ -10,7 +10,8 @@
  */
 
 var Lexer = require('./lexer')
-  , nodes = require('./nodes');
+  , nodes = require('./nodes')
+  , utils = require('./utils');
 
 /**
  * Initialize `Parser` with the given input `str` and `filename`.
@@ -485,7 +486,7 @@ Parser.prototype = {
     var path = join(dir, path)
       , str = fs.readFileSync(path, 'utf8')
      , parser = new Parser(str, path, this.options);
-    parser.blocks = this.blocks;
+    parser.blocks = utils.extend({}, this.blocks);
     parser.mixins = this.mixins;
 
     this.context(parser);

lib/utils.js

@@ -46,4 +46,13 @@ var escape = exports.escape = function(str) {
 
 exports.text = function(str){
   return interpolate(escape(str));
-};
+};
+
+// Extend a given object with all the properties of the source
+exports.extend = function(obj, src) {
+  for (var prop in src) {
+    obj[prop] = src[prop];
+  }
+  return obj;
+};
+

test/cases/auxiliary/empty-block.jade

@@ -0,0 +1,2 @@
+block test
+

test/cases/auxiliary/extends-empty-block-1.jade

@@ -0,0 +1,5 @@
+extends empty-block
+
+block test
+    div test1
+

test/cases/auxiliary/extends-empty-block-2.jade

@@ -0,0 +1,5 @@
+extends empty-block
+
+block test
+    div test2
+

test/cases/include-extends-of-common-template.html

@@ -0,0 +1,2 @@
+<div>test1</div>
+<div>test2</div>

test/cases/include-extends-of-common-template.jade

@@ -0,0 +1,2 @@
+include auxiliary/extends-empty-block-1
+include auxiliary/extends-empty-block-2