Comparing version 0.8.4 to 0.8.5
{ | ||
"name": "bemer", | ||
"description": "Template engine. BEMJSON to HTML processor.", | ||
"version": "0.8.4", | ||
"version": "0.8.5", | ||
"license": "MIT", | ||
"main": "bemer.js", | ||
"ignore": [ | ||
@@ -10,2 +11,3 @@ "**/.*", | ||
"test", | ||
"benchmark", | ||
"Gruntfile.js", | ||
@@ -12,0 +14,0 @@ "index.js", |
@@ -287,10 +287,13 @@ definer('Node', /** @exports Node */ function(Tag, Selector, object) { | ||
_getElemModsClasses: function() { | ||
this._name.modVal(false); | ||
var list = this._getModsClasses('elemMod'); | ||
if(!object.isEmpty(this._bemjson.mods)) { | ||
return Object.keys(this._bemjson.mods).reduce(function(classes, key) { | ||
list = list.concat(Object.keys(this._bemjson.mods).reduce(function(classes, key) { | ||
this._name.mod(key, this._bemjson.mods[key]); | ||
return classes.concat(this._getModsClasses('elemMod')); | ||
}.bind(this), []); | ||
}.bind(this), [])); | ||
} | ||
return this._getModsClasses('elemMod'); | ||
return list; | ||
} | ||
@@ -297,0 +300,0 @@ |
@@ -63,3 +63,3 @@ definer('Tree', /** @exports Tree */ function(Template, is, object) { | ||
* @param {object} [context] Информация о контекстуальном блоке | ||
* @param {object} [context.block] Имя контекстуального блока | ||
* @param {string} [context.block] Имя контекстуального блока | ||
* @param {object} [context.mods] Модификаторы контекстуального блока | ||
@@ -105,3 +105,3 @@ * @returns {array} | ||
* @param {object} [context] Информация о контекстуальном блоке | ||
* @param {object} [context.block] Имя контекстуального блока | ||
* @param {string} [context.block] Имя контекстуального блока | ||
* @param {object} [context.mods] Модификаторы контекстуального блока | ||
@@ -118,3 +118,3 @@ * @returns {Node|*} | ||
bemjson.block = context.block; | ||
bemjson.mods = object.extend(context.mods, bemjson.mods || {}); | ||
bemjson.mods = object.extend(object.clone(context.mods), bemjson.mods || {}); | ||
} | ||
@@ -121,0 +121,0 @@ |
{ | ||
"name": "bemer", | ||
"description": "Template engine. BEMJSON to HTML processor.", | ||
"version": "0.8.4", | ||
"version": "0.8.5", | ||
"repository": { | ||
@@ -6,0 +6,0 @@ "type": "git", |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
4774479
75
6283