diff --git a/common.blocks/progressbar/progressbar.bemhtml b/common.blocks/progressbar/progressbar.bemhtml index e6a545ac1..c53b93c3e 100644 --- a/common.blocks/progressbar/progressbar.bemhtml +++ b/common.blocks/progressbar/progressbar.bemhtml @@ -1,14 +1,14 @@ block('progressbar')( js()(function(){ - return { val : this.ctx.val }; + return { val : this.ctx.val || 0 }; }), content()( function() { return { elem : 'bar', - attrs : { style : 'width:' + this.ctx.val + '%' } + attrs : { style : 'width:' + (this.ctx.val || 0) + '%' } }; }, match(function() { return typeof this.ctx.content !== 'undefined'; })(function() { diff --git a/common.blocks/progressbar/progressbar.bh.js b/common.blocks/progressbar/progressbar.bh.js index 099755a87..79b3fb199 100644 --- a/common.blocks/progressbar/progressbar.bh.js +++ b/common.blocks/progressbar/progressbar.bh.js @@ -1,7 +1,7 @@ module.exports = function(bh) { bh.match('progressbar', function(ctx, json) { - var val = json.val; + var val = json.val || 0; ctx .js({ val : val }) diff --git a/common.blocks/progressbar/progressbar.en.md b/common.blocks/progressbar/progressbar.en.md index 3ff2ccf8d..2a7c01f40 100644 --- a/common.blocks/progressbar/progressbar.en.md +++ b/common.blocks/progressbar/progressbar.en.md @@ -50,7 +50,7 @@ The modifier gives the block a custom design. Type: `Number`. -Specifies the status of the process progress (in percent relative to its parental block). +Specifies the status of the process progress (in percent relative to its parental block). By default process progress is equal to 0; ```js { diff --git a/common.blocks/progressbar/progressbar.ru.md b/common.blocks/progressbar/progressbar.ru.md index 6ff050991..5653fe955 100644 --- a/common.blocks/progressbar/progressbar.ru.md +++ b/common.blocks/progressbar/progressbar.ru.md @@ -50,7 +50,7 @@ Тип: `Number`. -Определяет степень выполнения процесса в процентах относительно родителя. +Определяет степень выполнения процесса в процентах относительно родителя. При отсутствии этого поля степень выполнения равна нулю. ```js { diff --git a/common.blocks/progressbar/progressbar.tmpl-specs/10-default.bemjson.js b/common.blocks/progressbar/progressbar.tmpl-specs/10-default.bemjson.js index 2a1633040..d783ac3c1 100644 --- a/common.blocks/progressbar/progressbar.tmpl-specs/10-default.bemjson.js +++ b/common.blocks/progressbar/progressbar.tmpl-specs/10-default.bemjson.js @@ -1,4 +1,3 @@ ({ - block : 'progressbar', - val : 24 + block : 'progressbar' }) diff --git a/common.blocks/progressbar/progressbar.tmpl-specs/10-default.html b/common.blocks/progressbar/progressbar.tmpl-specs/10-default.html index ff33570ab..0953482d4 100644 --- a/common.blocks/progressbar/progressbar.tmpl-specs/10-default.html +++ b/common.blocks/progressbar/progressbar.tmpl-specs/10-default.html @@ -1 +1 @@ -
+ diff --git a/common.blocks/progressbar/progressbar.tmpl-specs/20-val.bemjson.js b/common.blocks/progressbar/progressbar.tmpl-specs/20-val.bemjson.js new file mode 100644 index 000000000..2a1633040 --- /dev/null +++ b/common.blocks/progressbar/progressbar.tmpl-specs/20-val.bemjson.js @@ -0,0 +1,4 @@ +({ + block : 'progressbar', + val : 24 +}) diff --git a/common.blocks/progressbar/progressbar.tmpl-specs/20-val.html b/common.blocks/progressbar/progressbar.tmpl-specs/20-val.html new file mode 100644 index 000000000..ff33570ab --- /dev/null +++ b/common.blocks/progressbar/progressbar.tmpl-specs/20-val.html @@ -0,0 +1 @@ +