From f2c8fcfc22d7f69e8031dcb8c1ac27424a3a278f Mon Sep 17 00:00:00 2001
From: yiminghe <yiminghe@gmail.com>
Date: Tue, 21 Jul 2015 00:10:13 +0800
Subject: [PATCH] upgrade slider

---
 components/slider/demo/basic.md | 2 +-
 components/slider/demo/mark.md  | 4 ++--
 components/slider/index.jsx     | 2 +-
 components/slider/index.md      | 6 ++++--
 package.json                    | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/components/slider/demo/basic.md b/components/slider/demo/basic.md
index 84abebdd21..eb4049c690 100644
--- a/components/slider/demo/basic.md
+++ b/components/slider/demo/basic.md
@@ -11,7 +11,7 @@ var Slider = antd.Slider;
 
 React.render(<div>
   <Slider />
-  <Slider value={65} disabled />
+  <Slider defaultValue={65} disabled />
 </div>
 , document.getElementById('components-slider-demo-basic'));
 ````
diff --git a/components/slider/demo/mark.md b/components/slider/demo/mark.md
index 4f1f486220..326517f269 100644
--- a/components/slider/demo/mark.md
+++ b/components/slider/demo/mark.md
@@ -12,9 +12,9 @@ var Slider = antd.Slider;
 React.render(
 <div className="sliderContainer">
   <p>包含关系</p>
-  <Slider marks={["状态1","状态2","状态3","状态4"]} index={1} />
+  <Slider marks={["状态1","状态2","状态3","状态4"]} defaultIndex={1} />
   <p>并列关系</p>
-  <Slider marks={["状态1","状态2","状态3","状态4"]} isIncluded={false} index={1} />
+  <Slider marks={["状态1","状态2","状态3","状态4"]} isIncluded={false} defaultIndex={1} />
 </div>
 , document.getElementById('components-slider-demo-mark'));
 ````
diff --git a/components/slider/index.jsx b/components/slider/index.jsx
index 10b0d02ea1..73f9da7107 100644
--- a/components/slider/index.jsx
+++ b/components/slider/index.jsx
@@ -4,7 +4,7 @@ var Slider = require('rc-slider');
 var AntSlider = React.createClass({
   getDefaultProps() {
     return {
-      className: 'ant-slider'
+      prefixCls: 'ant-slider'
     };
   },
   render() {
diff --git a/components/slider/index.md b/components/slider/index.md
index 7f6e6c2d7d..9759dd9ea7 100644
--- a/components/slider/index.md
+++ b/components/slider/index.md
@@ -19,8 +19,10 @@
 | min        | Number			| 0				| 最小值
 | max        | Number			| 100           | 最大值
 | step       | Number			| 1				| 步长，取值必须大于 0，并且可被 (max - min) 整除
-| value      | Number 			| 0           	| 当前取值
+| value      | Number 			|            	| 当前取值
+| defaultValue      | Number 			| 0           	| 初始取值
 | marks      | Array		    | [] 			| 分段标记，标记每一个 step，如果 step 属性没有定义，则 `marks` 属性会被忽略
 | isIncluded | Boolean			| true			| 分段式滑块，值为 true 时表示值为包含关系，false 表示并列
-| index      | Number 			| 0           	| 为具备 `step` 或者 `marks` 的 slider 提供滑块操作按钮最初的位置
+| index      | Number 			|            	| 为具备 `step` 或者 `marks` 的 slider 提供滑块操作的当前位置
+| defaultIndex      | Number 			| 0           	| 为具备 `step` 或者 `marks` 的 slider 提供滑块操作的初始位置
 | disabled   | Boolean 			| false         | 值为 `true` 时，滑块为 disable 禁用状态
diff --git a/package.json b/package.json
index 9a1a5f85e2..829fde03f8 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "rc-progress": "~1.0.0",
     "rc-radio": "~2.0.0",
     "rc-select": "~4.4.0",
-    "rc-slider": "~1.2.6",
+    "rc-slider": "~1.3.1",
     "rc-steps": "~1.1.4",
     "rc-switch": "~1.2.0",
     "rc-table": "~3.1.0",
-- 
GitLab