Comparing version 0.27.5 to 0.27.6
@@ -23,3 +23,3 @@ /*! | ||
exports.version = '0.27.5'; | ||
exports.version = '0.27.6'; | ||
@@ -26,0 +26,0 @@ /** |
@@ -13,3 +13,4 @@ | ||
var Lexer = require('./lexer') | ||
, nodes = require('./nodes'); | ||
, nodes = require('./nodes') | ||
, utils = require('./utils'); | ||
@@ -489,3 +490,3 @@ /** | ||
, parser = new Parser(str, path, this.options); | ||
parser.blocks = this.blocks; | ||
parser.blocks = utils.merge({}, this.blocks); | ||
parser.mixins = this.mixins; | ||
@@ -492,0 +493,0 @@ |
@@ -49,2 +49,17 @@ | ||
return interpolate(escape(str)); | ||
}; | ||
}; | ||
/** | ||
* Merge `b` into `a`. | ||
* | ||
* @param {Object} a | ||
* @param {Object} b | ||
* @return {Object} | ||
* @api public | ||
*/ | ||
exports.merge = function(a, b) { | ||
for (var key in b) a[key] = b[key]; | ||
return a; | ||
}; | ||
{ | ||
"name": "jade", | ||
"description": "Jade template engine", | ||
"version": "0.27.5", | ||
"version": "0.27.6", | ||
"author": "TJ Holowaychuk <tj@vision-media.ca>", | ||
@@ -6,0 +6,0 @@ "repository": "git://github.com/visionmedia/jade", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
240635
6185