Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0

components/datepicker/demo/locale.md

@@ -9,22 +9,16 @@
 ````jsx
 import { Datepicker } from 'antd';
 import enUS from 'antd/lib/datepicker/locale/en_US';
-
-function assign(target, source) {
-  for(var s in source) {
-    target[s] = source[s];
-  }
-  return target;
-}
+import assign from 'object-assign'
 
 const App = React.createClass({
   getInitialState() {
     return {
-      locale: assign({
+      locale: assign({}, enUS, {
         timezoneOffset: 0 * 60,
         firstDayOfWeek: 0,
         minimalDaysInFirstWeek: 1
-      }, enUS)
+      })
     };
   },
   render() {

scripts/demo.js

@@ -9,6 +9,7 @@ var semver = require('semver');
 window.antd = antd;
 window.React = React;
 window.ReactDOM = ReactDOM;
+window['object-assign'] = require('object-assign');
 
 InstantClickChangeFns.push(function () {
   // auto complete for components