From 2c58d5e1ce5cb78302e82cbcf291beba78c890c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E5=A5=88?= <shuaiji.tsj@alibaba-inc.com>
Date: Mon, 15 Jun 2015 11:48:30 +0800
Subject: [PATCH] mini demo

---
 components/progress/demo/circle-mini.md | 27 ++++++++++++++++++++
 components/progress/demo/circle.md      |  6 ++---
 components/progress/demo/line-mini.md   | 19 ++++++++++++++
 components/progress/demo/line.md        |  6 ++---
 components/progress/index.jsx           | 34 ++++++++++++-------------
 components/progress/index.md            |  2 +-
 6 files changed, 70 insertions(+), 24 deletions(-)
 create mode 100644 components/progress/demo/circle-mini.md
 create mode 100644 components/progress/demo/line-mini.md

diff --git a/components/progress/demo/circle-mini.md b/components/progress/demo/circle-mini.md
new file mode 100644
index 0000000000..e0b4de1508
--- /dev/null
+++ b/components/progress/demo/circle-mini.md
@@ -0,0 +1,27 @@
+# Circle 用法
+
+- order: 0
+
+Progress Circle用法
+
+---
+
+````jsx
+var Circle = antd.Progress.Circle;
+
+React.render(
+  <div>
+    <Circle percent="30" width="100" strokeWidth="4" />
+    <Circle percent="70" width="100" strokeWidth="4" status="exception" />
+    <Circle percent="100" width="100" strokeWidth="4" />
+  </div>
+  , document.getElementById('components-progress-demo-circle-mini'));
+````
+
+<style>
+.ant-progress-circle-wrap,
+.ant-progress-line-wrap {
+  margin-right: 15px;
+  margin-bottom: 15px;
+}
+</style>
diff --git a/components/progress/demo/circle.md b/components/progress/demo/circle.md
index 5bf88efda7..dadc551f24 100644
--- a/components/progress/demo/circle.md
+++ b/components/progress/demo/circle.md
@@ -11,9 +11,9 @@ var Circle = antd.Progress.Circle;
 
 React.render(
   <div>
-    <Circle percent="30" width="100" strokeWidth="4" />
-    <Circle percent="70" width="100" strokeWidth="4" status="exception" />
-    <Circle percent="100" width="100" strokeWidth="4" />
+    <Circle percent="30" width="150" strokeWidth="4" />
+    <Circle percent="70" width="150" strokeWidth="4" status="exception" />
+    <Circle percent="100" width="150" strokeWidth="4" />
   </div>
   , document.getElementById('components-progress-demo-circle'));
 ````
diff --git a/components/progress/demo/line-mini.md b/components/progress/demo/line-mini.md
new file mode 100644
index 0000000000..eb5ab9eeb9
--- /dev/null
+++ b/components/progress/demo/line-mini.md
@@ -0,0 +1,19 @@
+# Line 用法
+
+- order: 0
+
+Progress Line用法
+
+---
+
+````jsx
+var Line = antd.Progress.Line;
+
+React.render(
+  <div>
+    <Line percent="30" width="170" strokeWidth="3" />
+    <Line percent="70" width="170" strokeWidth="3" status="exception" />
+    <Line percent="100" width="170" strokeWidth="3" />
+  </div>
+  , document.getElementById('components-progress-demo-line-mini'));
+````
diff --git a/components/progress/demo/line.md b/components/progress/demo/line.md
index 181ee4f108..8acf417078 100644
--- a/components/progress/demo/line.md
+++ b/components/progress/demo/line.md
@@ -11,9 +11,9 @@ var Line = antd.Progress.Line;
 
 React.render(
   <div>
-    <Line percent="30" width="300" strokeWidth="4" />
-    <Line percent="70" width="300" strokeWidth="4" status="exception" />
-    <Line percent="100" width="300" strokeWidth="4" />
+    <Line percent="30" width="300" strokeWidth="3" />
+    <Line percent="70" width="300" strokeWidth="3" status="exception" />
+    <Line percent="100" width="300" strokeWidth="3" />
   </div>
   , document.getElementById('components-progress-demo-line'));
 ````
diff --git a/components/progress/index.jsx b/components/progress/index.jsx
index 88b4319a44..d4074d5e54 100644
--- a/components/progress/index.jsx
+++ b/components/progress/index.jsx
@@ -10,7 +10,7 @@ var Line = React.createClass({
       percent: 0,
       strokeWidth: 2,
       status: 'normal' // exception
-    }
+    };
   },
   render() {
     var statusColorMap = {
@@ -20,35 +20,35 @@ var Line = React.createClass({
     };
 
     if (parseInt(this.props.percent) === 100) {
-      this.props.status = 'success'
+      this.props.status = 'success';
     }
 
     var style = {
       'width': this.props.width
-    }
+    };
     var wrapStyle = {
       'font-size': this.props.width / 100 * this.props.strokeWidth
-    }
+    };
     var textStyle = {
       'color': statusColorMap[this.props.status]
-    }
-    var progressInfo
+    };
+    var progressInfo;
     if (this.props.status === 'exception') {
       progressInfo = (
         <span style={textStyle} className='ant-progress-line-text'>
           <i className='anticon anticon-exclamation-round'></i>
         </span>
-      )
+      );
     } else if(this.props.status === 'success'){
       progressInfo = (
         <span style={textStyle} className='ant-progress-line-text'>
           <i className='anticon anticon-check-round'></i>
         </span>
-      )
+      );
     }else {
       progressInfo = (
         <span className='ant-progress-line-text'>{this.props.percent}%</span>
-      )
+      );
     }
 
     return (
@@ -69,7 +69,7 @@ var Circle = React.createClass({
       percent: 0,
       strokeWidth: 2,
       status: 'normal' // exception
-    }
+    };
   },
   render() {
     var statusColorMap = {
@@ -79,30 +79,30 @@ var Circle = React.createClass({
     };
 
     if (parseInt(this.props.percent) === 100) {
-      this.props.status = 'success'
+      this.props.status = 'success';
     }
 
     var style = {
       'width': this.props.width,
       'height': this.props.width
-    }
+    };
     var wrapStyle = {
       'font-size': this.props.width * 0.3
-    }
+    };
     var textStyle = {
       'color': statusColorMap[this.props.status]
-    }
-    var progressInfo
+    };
+    var progressInfo;
     if (this.props.status === 'exception') {
       progressInfo = (
         <span style={textStyle} className='ant-progress-circle-text'>
           <i className='anticon anticon-exclamation'></i>
         </span>
-      )
+      );
     }else {
       progressInfo = (
         <span className="ant-progress-circle-text">{this.props.percent}%</span>
-      )
+      );
     }
 
     return (
diff --git a/components/progress/index.md b/components/progress/index.md
index c60f339749..82c6143e99 100644
--- a/components/progress/index.md
+++ b/components/progress/index.md
@@ -16,7 +16,7 @@
 
 | 参数     | 说明           | 类型     | 默认值       |
 |----------|----------------|----------|--------------|
-| perscent    | 百分比           | number   | 0           |
+| percent    | 百分比           | number   | 0           |
 | status   | 状态，有两个值normal、exception | string   | normal |
 | strokeWidth | 进度条线宽度，单位是进度条画布宽度的百分比 | number | 1           |
 | width | 必填，进度条画布宽度，单位px。这里没有提供height属性设置，Line型高度就是strokeWidth，Circle型高度等于width | number | null |