Merge branch 'dev' of https://github.com/ant-design/ant-design.github.io into dev

components/datepicker/demo/basic.md

@@ -1,5 +1,6 @@
 # 基本
 
+- order: 0
 - description: 最简单的用法
 
 ---

components/datepicker/demo/formatter.md

@@ -1,6 +1,7 @@
 # 日期格式
 
-- description: 自定义您需要的日期定义格式：yyyy/MM/dd
+- order: 1
+- description: 使用 `format` 属性自定义您需要的日期定义格式：yyyy/MM/dd
 
 ---
 

components/datepicker/demo/range.md

@@ -0,0 +1,25 @@
+# 范围
+
+- order: 3
+- description: 设置可选日期的范围，用 disabled 方法来定义不可选择时间。
+
+---
+
+````jsx
+var Datepicker = antd.datepicker;
+
+var Picker = React.createClass({
+  handleChange: function(value) {
+    console.log(new Date(value.getTime()));
+  },
+  render: function() {
+    return <Datepicker onSelect={this.handleChange} />
+  }
+});
+
+React.render(
+  <Picker />
+, document.getElementById('components-datepicker-demo-range'));
+````
+
+

components/datepicker/demo/select.md

@@ -1,6 +1,7 @@
-# 基本
+# 选择日期
 
-- description: 选择日期的回调
+- order: 2
+- description: 通过设置选择日期的回调事件 `onSelect`，完成交互行为。
 
 ---
 
@@ -20,4 +21,3 @@ React.render(
   <Picker />
 , document.getElementById('components-datepicker-demo-select'));
 ````
-

components/datepicker/index.jsx

@@ -32,8 +32,6 @@ module.exports = React.createClass({
     this.props.onSelect(new Date(this.state.value.getTime()));
   },
   render: function () {
-    var state = this.state;
-    var formatter = new DateTimeFormat(this.props.format);
     var calendar = (
       <Calendar
       locale={CalendarLocale}
@@ -43,8 +41,10 @@ module.exports = React.createClass({
       return (
         <DatePicker
           trigger={<span className="rc-calendar-picker-icon" />}
-          formatter={formatter} calendar={calendar}
-          value={this.state.value} onChange={this.props.onSelect}>
+          calendar={calendar}
+          formatter={new DateTimeFormat(this.props.format)}
+          value={this.state.value}
+          onChange={this.props.onSelect}>
           <input className="rc-calendar-picker-input" />
         </DatePicker>
       );

components/datepicker/index.md

@@ -32,3 +32,9 @@
 我说去他妈的爱情 都是过眼云烟的东西
 
 我的余生 都用来寻找北方
+
+<style>
+.rc-calendar-picker-input {
+  width: 200px;
+}
+</style>

package.json

@@ -22,6 +22,8 @@
     "gh-pages-cli": "~0.2.0",
     "json-loader": "~0.5.1",
     "jsx-loader": "~0.13.2",
+    "less": "~2.5.1",
+    "less-loader": "~2.2.0",
     "lodash": "~3.8.0",
     "nico-jsx": "~0.5.3",
     "style-loader": "~0.12.2",

static/script.js

@@ -25,13 +25,6 @@ $(function() {
     }, 150);
   }
 
-  /*$('.aside-container li h4').click(function() {
-    $(this).next().animate({
-      height: 'toggle',
-      opacity: 'toggle'
-    }, 150);
-  });*/
-
   var navFunc={
     navStrArr: [],
     init:function (){

theme/theme.js

@@ -57,6 +57,17 @@ module.exports = function(nico) {
           ret.push(page);
         }
       });
+      ret = ret.sort(function(a, b) {
+        if (/index$/i.test(a.filename)) {
+          a.meta.order = 1;
+        }
+        if (/index$/i.test(b.filename)) {
+          b.meta.order = 1;
+        }
+        a = a.meta.order || 100;
+        b = b.meta.order || 100;
+        return parseInt(a, 10) - parseInt(b, 10);
+      });
       return ret;
     },
     // For Debug

webpack.config.js

@@ -22,6 +22,7 @@ module.exports = {
       {test: /\.jsx$/, loader: 'jsx-loader?harmony'},
       {test: /\.js$/, loader: 'jsx-loader?harmony'},
       {test: /\.json$/, loader: 'json-loader'},
+      {test: /\.less$/, loader: "style!css!less"},
       {test: /\.css/, loader: 'style!css'}
     ]
   },