Merge pull request #1471 from /issues/1468@v2

progressbar: assign 'val' field to zero by default
bem · Apr 23, 2015 · fa17809 · fa17809
2 parents 1e3d816 + 8427dfa
commit fa17809
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-<div class="progressbar i-bem" data-bem="{&quot;progressbar&quot;:{&quot;val&quot;:24}}"><div class="progressbar__bar" style="width:24%"></div></div>
+<div class="progressbar i-bem" data-bem="{&quot;progressbar&quot;:{&quot;val&quot;:0}}"><div class="progressbar__bar" style="width:0%"></div></div>
diff --git a/common.blocks/progressbar/progressbar.tmpl-specs/20-val.bemjson.js 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
@@ -0,0 +1 @@
+<div class="progressbar i-bem" data-bem="{&quot;progressbar&quot;:{&quot;val&quot;:24}}"><div class="progressbar__bar" style="width:24%"></div></div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
     {
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<div class="progressbar i-bem" data-bem="{"progressbar":{"val":24}}"><div class="progressbar__bar" style="width:24%"></div></div>
		<div class="progressbar i-bem" data-bem="{"progressbar":{"val":0}}"><div class="progressbar__bar" style="width:0%"></div></div>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<div class="progressbar i-bem" data-bem="{"progressbar":{"val":24}}"><div class="progressbar__bar" style="width:24%"></div></div>