From 1c73c61f175b099a11e92c0738c5ede642e15c75 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 8 Mar 2016 19:39:08 +0800 Subject: [PATCH 01/20] fix touch event --- scripts/demo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/demo.js b/scripts/demo.js index 891691956b..41251392f3 100644 --- a/scripts/demo.js +++ b/scripts/demo.js @@ -382,7 +382,7 @@ InstantClickChangeFns.push(function() { navMenu.removeClass('nav-hide').addClass('nav-show'); }); - $('body').on('click', function (e) { + $('body').on('click touchstart', function (e) { if (e.target !== $('.nav-phone-icon')[0] && !navMenu[0].contains(e.target) && navMenu.hasClass('nav-show')) { From 3e0d11043b3dfbef95dc8bd177e39fc7830a576d Mon Sep 17 00:00:00 2001 From: yiminghe Date: Tue, 8 Mar 2016 20:29:18 +0800 Subject: [PATCH 02/20] fix pagination in table --- components/table/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/table/index.jsx b/components/table/index.jsx index 32ffc4d205..72648e2f2d 100644 --- a/components/table/index.jsx +++ b/components/table/index.jsx @@ -86,7 +86,7 @@ let AntTable = React.createClass({ componentWillReceiveProps(nextProps) { if (('pagination' in nextProps) && nextProps.pagination !== false) { this.setState({ - pagination: objectAssign({}, this.state.pagination, nextProps.pagination) + pagination: objectAssign({}, defaultPagination, this.state.pagination, nextProps.pagination) }); } // dataSource 的变化会清空选中项 From 1be6669bb7d74ee20ca47dd335d60319a790e54b Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 8 Mar 2016 23:44:42 +0800 Subject: [PATCH 03/20] remove es3ify, ref #858 --- webpack.config.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index bcba32864e..49f7afa0f0 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -26,10 +26,6 @@ module.exports = { module: { loaders: [{ - test: /\.jsx?$/, - exclude: /node_modules/, - loader: 'es3ify', - }, { test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel', From 6526468f575b03f92f02da9e7e4af2ecc916da69 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 8 Mar 2016 23:53:09 +0800 Subject: [PATCH 04/20] fix inline FormItem margin, close #1141 --- style/components/form.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/style/components/form.less b/style/components/form.less index 0c7adfc14e..ce0c7c73ca 100644 --- a/style/components/form.less +++ b/style/components/form.less @@ -242,6 +242,12 @@ form { .@{css-prefix}form-item { display: inline-block; margin-right: 10px; + margin-bottom: 0; + + &-with-help { + margin-bottom: 24px; + } + > div { display: inline-block; } From 56fb20b76dedd6469184f8dd8c71f21bb679b7dc Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 9 Mar 2016 11:33:05 +0800 Subject: [PATCH 05/20] Fix date-picker style prop --- components/date-picker/index.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/date-picker/index.jsx b/components/date-picker/index.jsx index 85670591ec..b6dd9fb69a 100644 --- a/components/date-picker/index.jsx +++ b/components/date-picker/index.jsx @@ -115,7 +115,7 @@ function createPicker(TheCalendar, defaultFormat) { pickerClass += ' ant-calendar-picker-open'; } return ( - + From 3baf790341fa7c83afe103d03ab2642240447260 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 9 Mar 2016 11:50:02 +0800 Subject: [PATCH 06/20] fix badge style --- style/components/badge.less | 1 + 1 file changed, 1 insertion(+) diff --git a/style/components/badge.less b/style/components/badge.less index 94b1a1726a..84cc76f362 100644 --- a/style/components/badge.less +++ b/style/components/badge.less @@ -5,6 +5,7 @@ position: relative; display: inline-block; line-height: 1; + vertical-align: middle; &-count { position: absolute; From b706a024c6097f37bef72c55e804715d1f17465a Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 9 Mar 2016 11:50:11 +0800 Subject: [PATCH 07/20] Fix autoprefix --- package.json | 1 + webpack.config.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/package.json b/package.json index 416565f6d6..6d769c3157 100644 --- a/package.json +++ b/package.json @@ -72,6 +72,7 @@ "warning": "~2.1.0" }, "devDependencies": { + "autoprefixer": "^6.3.3", "babel-cli": "^6.2.0", "babel-core": "^6.2.1", "babel-jest": "^6.0.1", diff --git a/webpack.config.js b/webpack.config.js index 49f7afa0f0..ef21c5af4e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -2,6 +2,7 @@ var webpack = require('webpack'); var ExtractTextPlugin = require("extract-text-webpack-plugin"); var path = require('path'); var pkg = require('./package'); +var autoprefixer = require('autoprefixer'); var entry = {}; entry['demo'] = ['./scripts/demo.js', 'webpack-hot-middleware/client']; @@ -53,6 +54,8 @@ module.exports = { }] }, + postcss: [autoprefixer], + plugins: [ new ExtractTextPlugin('[name].css'), new webpack.optimize.OccurenceOrderPlugin(), From 1c5bc26e9f16f76b73d7630271ea3d39a5aa22a1 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 9 Mar 2016 11:57:00 +0800 Subject: [PATCH 08/20] Fix badge in old webkit browser --- components/badge/ScrollNumber.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/components/badge/ScrollNumber.jsx b/components/badge/ScrollNumber.jsx index 9b91e788a3..7acf36799d 100644 --- a/components/badge/ScrollNumber.jsx +++ b/components/badge/ScrollNumber.jsx @@ -76,6 +76,7 @@ class AntScrollNumber extends React.Component { className: `${this.props.prefixCls}-only`, style: { transition: removeTransition && 'none', + webkitTransform: `translate3d(0, ${-position * height}px, 0)`, transform: `translate3d(0, ${-position * height}px, 0)`, height, }, From a553f6b2999f14a9584985b4ff98115c5ef9ea54 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 9 Mar 2016 11:59:02 +0800 Subject: [PATCH 09/20] typo --- components/badge/ScrollNumber.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/badge/ScrollNumber.jsx b/components/badge/ScrollNumber.jsx index 7acf36799d..27a2fd19d5 100644 --- a/components/badge/ScrollNumber.jsx +++ b/components/badge/ScrollNumber.jsx @@ -76,7 +76,7 @@ class AntScrollNumber extends React.Component { className: `${this.props.prefixCls}-only`, style: { transition: removeTransition && 'none', - webkitTransform: `translate3d(0, ${-position * height}px, 0)`, + WebkitTransform: `translate3d(0, ${-position * height}px, 0)`, transform: `translate3d(0, ${-position * height}px, 0)`, height, }, From e5ba8b72f5d3e326070a52fd6c272cb4a55ae4cb Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 9 Mar 2016 16:01:02 +0800 Subject: [PATCH 10/20] upgrade polyfill files --- docs/react/getting-started.md | 2 +- site/templates/layout.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/react/getting-started.md b/docs/react/getting-started.md index b9ca914184..fb552d8a69 100644 --- a/docs/react/getting-started.md +++ b/docs/react/getting-started.md @@ -119,7 +119,7 @@ Ant Design React 支持所有的现代浏览器和 IE8+。 - + diff --git a/site/templates/layout.html b/site/templates/layout.html index 28ddc69da8..1629b3cb0d 100644 --- a/site/templates/layout.html +++ b/site/templates/layout.html @@ -13,7 +13,7 @@ {% block styles %}{% endblock %} - +