Commit Graph

163 Commits

Author SHA1 Message Date
Benjy Cui
ebab622add Merge branch 'master' of github.com:ant-design/ant-design into develop-1.0.0 2016-03-15 09:47:55 +08:00
afc163
80d6ae30a8 Add propTypes and prop align in Modal docs 2016-03-14 11:46:48 +08:00
Benjy Cui
02f507f156 fix: should copy defaultLocale instead of refer 2016-03-10 10:32:50 +08:00
afc163
95c1ead55b fix text 2016-03-10 10:32:50 +08:00
afc163
83f96e5f19 Make LocalProvider compatible with Modal.xxx 2016-03-10 10:32:50 +08:00
afc163
2482140d2f Change context locale name 2016-03-10 10:32:50 +08:00
afc163
99b58e67ec Add other component for locale 2016-03-10 10:32:49 +08:00
afc163
5a9b7a295f update docs 2016-03-06 00:10:36 +08:00
Benjy Cui
c1659c2ce3 style: update code style to please lint 2016-02-22 10:52:30 +08:00
Benjy Cui
9d022ff84c style: update code style to please lint 2016-02-17 15:57:33 +08:00
afc163
6700dbba2a Fix Modal onCancel argument, ref #980 2016-02-02 14:54:34 +08:00
Benjy Cui
68b51e298d style: update code style for space-before-function-paren 2016-01-27 17:00:58 +08:00
afc163
66b7ee81ad fix eslint problems, eslint-config-airbnb@4.x 2016-01-23 15:22:16 +08:00
afc163
cfc141b1c7 capture mousePosition event register in document 2016-01-22 13:54:53 +08:00
afc163
a16903009e merge from master 2016-01-13 22:22:33 +08:00
afc163
24bd1f09da fix Modal case bug 2016-01-13 16:46:38 +08:00
Benjy Cui
7ae966873a fix: cyclic reference in Modal 2016-01-12 17:07:24 +08:00
Benjy Cui
aa5c4f9595 style: update code style to please lint 2016-01-11 09:49:31 +08:00
Benjy Cui
b72d18fd44 style: update code style to please the fucking lint 2016-01-11 09:49:30 +08:00
Benjy Cui
209170e813 style: update demo code style to please lint 2016-01-11 09:49:30 +08:00
Benjy Cui
711d2d7413 style: update code style to please lint 2016-01-11 09:49:30 +08:00
Benjy Cui
a7b2c2e348 feat: expose closable for Modal 2016-01-06 10:21:02 +08:00
afc163
91bd7f22c0 use mountNode replace the long getElementById 2015-12-29 12:08:58 +08:00
Benjy Cui
7cd8b34015 chore: remove useless div 2015-12-15 17:54:43 +08:00
afc163
bd14d75419 Merge pull request #584 from ant-design/feat-button-text
Add i18n for `Table` `Modal` `Popconfirm`
2015-11-26 11:59:20 +08:00
afc163
d1d3329674 fix boolean attribute lint errors 2015-11-25 18:10:35 +08:00
afc163
16abf46071 Fix markdown eslint errors, update .eslintrc 2015-11-25 18:10:34 +08:00
shelwin
042f016dd4 update modal confirm demo 2015-11-25 16:17:58 +08:00
Benjy Cui
dba62729b0 refactor: set okText cancel defaultValue 2015-11-24 16:48:21 +08:00
Benjy Cui
b110b8787b docs: update demos 2015-11-24 16:39:16 +08:00
Benjy Cui
fdd9ef7d18 feat: Modal should support internationalization 2015-11-24 11:01:36 +08:00
afc163
e058e67cb4 fix iconfont 2015-11-20 11:05:34 +08:00
yiminghe
dc1650486d fix button 2015-11-03 20:06:44 +08:00
afc163
753c01ae18 ES6 syntax for demo code
fix antd.notification
2015-10-28 20:55:49 +08:00
afc163
e19186f783 confirmLoading is fully controlled by props now, fix #392 2015-10-27 19:57:18 +08:00
afc163
5a50df6b78 use ghost button to match primary button 2015-10-26 11:08:36 +08:00
afc163
cad3fdff45 lg => large, sm => small 2015-10-26 11:02:48 +08:00
yiminghe
76b0f673ec beta2 2015-10-20 16:47:55 +08:00
afc163
aed7eae2bc Fix confirmLoading 2015-10-20 10:45:49 +08:00
afc163
8e00cdedf4 Merge branch 'master' into develop-0.10.0 2015-10-15 11:26:32 +08:00
afc163
ed7114e25e update modal info 2015-10-15 11:26:07 +08:00
Benjy Cui
5b86a4be1d refactor: replace button tag with Button component 2015-10-08 15:13:04 +08:00
elrrrrrrr
244c3a78a5 chore: 迁移 modal iconfont
- api 接口有变
2015-10-02 15:41:04 +08:00
afc163
176adab763 update modal basic demo 2015-09-22 15:11:29 +08:00
afc163
c5cab1d687 Add confirmLoading prop for Modal
You can use `confirmLoading` to cancel button loading status.

```
onOk() {
  ...
  this.setState({
    confirmLoading: false
  });
}
```

Fix #322
2015-09-22 15:06:10 +08:00
afc163
d6a4094bc4 Allow multiple confirm dialogs popup 2015-09-18 16:00:12 +08:00
afc163
a1d5030174 rollback blur mask 2015-09-11 17:11:00 +08:00
jljsj
9d5bc12db0 add modal bg blur, remove motion blur 2015-09-11 16:46:28 +08:00
afc163
6dbb7ba8ba update confirm modal button text 2015-09-08 15:03:02 +08:00
afc163
0ac1f76553 Fix visible state bug in handleCancel 2015-09-08 12:38:21 +08:00
afc163
a63e2f8c0c Remove console.log 2015-09-07 21:48:30 +08:00
afc163
75d710a1b8 Add some info type Modal, close #244 2015-09-07 11:48:57 +08:00
afc163
691b0147b1 update eslintrc and fix code 2015-09-01 16:19:39 +08:00
afc163
8c2c65adf4 update modal custom.md 2015-08-25 17:08:43 +08:00
afc163
e6d92e37b1 update modal default props 2015-08-25 16:56:08 +08:00
afc163
94c9081c83 default modal width change to 520px 2015-08-25 16:25:08 +08:00
afc163
fdf19520d6 Add component type 2015-08-22 20:16:24 +08:00
afc163
281dd27e96 short delay for detecting mousePosition 2015-08-19 10:09:44 +08:00
afc163
c3294dfc64 use arrow function 2015-08-18 20:27:40 +08:00
afc163
e95e557077 detect mousePosition in click event 2015-08-18 18:36:31 +08:00
afc163
77651c0621 update code style 2015-08-18 16:24:18 +08:00
afc163
192f150bc2 use rc-util addEventListener 2015-08-18 16:21:56 +08:00
afc163
c0c9b4a8d5 remove this.onDocumentMousemove 2015-08-18 13:21:48 +08:00
afc163
ee8335856c Only listen mousemove once
初始化时监听, 共享同一个 mousePosition
2015-08-18 13:19:00 +08:00
afc163
f4964626d9 open confirm from current mouse position 2015-08-18 13:15:16 +08:00
afc163
56b06e168f get mousePosition from mousemove listener for more elegant API 2015-08-18 12:26:19 +08:00
afc163
1c5e3485e7 Fix cancel button can not close modal
1. 关闭取消按钮的修复
2. 优化 loading 按钮的效果
2015-08-18 11:46:07 +08:00
yiminghe
099999ffc1 support mousePosition 2015-08-17 23:46:09 +08:00
yiminghe
867c4f2a85 support mousePosition 2015-08-17 23:42:52 +08:00
afc163
9d5e0a2e58 remove unused state visible 2015-08-17 16:44:38 +08:00
afc163
539ac64998 除了自定义页脚外,点击取消不需要手动设置关闭 2015-08-17 16:42:33 +08:00
afc163
edc0f4bbc0 modal custom footer demo 2015-08-14 14:35:15 +08:00
afc163
4eb849c783 fix boolean expression always true 2015-07-29 15:29:29 +08:00
ustccjw
b34269a6b1 use es6 module import/export
convert var to const

fix bug

fix bug

fix for jshint

fix import
2015-07-24 11:22:49 +08:00
ustccjw
41c35903a4 remove use strict 2015-07-23 21:36:34 +08:00
afc163
12b26137ea Add confirm button loading effect for modal 2015-07-22 17:32:22 +08:00
afc163
ecb45c3538 should be large button in modal 2015-07-22 16:57:30 +08:00
afc163
fa9914f34a components order 2015-07-20 12:28:36 +08:00
yiminghe
0a7410973e clean warning 2015-07-08 20:53:11 +08:00
yiminghe
82913b8610 support promise for modal 2015-06-25 15:35:46 +08:00
yiminghe
abcdaddcaa support promise for modal 2015-06-25 15:29:56 +08:00
afc163
74c30f4128 update modal style 2015-06-18 15:46:59 +08:00
afc163
f4b226075f Merge branch 'master' of github.com:ant-design/ant-design 2015-06-15 21:30:37 +08:00
afc163
4adae8b3ed fix modal style 2015-06-15 21:30:17 +08:00
yiminghe
e07159834e update motion 2015-06-15 21:22:40 +08:00
yiminghe
73d89f46af update motion 2015-06-15 21:18:08 +08:00
afc163
81ee5588bc tweak code style 2015-06-14 13:21:29 +08:00
afc163
22c48941e9 tweak code style 2015-06-14 13:20:35 +08:00
yiminghe
580481221f adjust onCancel 2015-06-12 23:46:04 +08:00
yiminghe
d5f760f9e7 remove ref 2015-06-12 23:31:44 +08:00
afc163
646c6853d6 move confirm into modal 2015-06-12 19:41:30 +08:00
afc163
b9b6cd33d0 components order 2015-06-12 17:49:30 +08:00
afc163
b5ae8925f2 update modal demos 2015-06-12 17:44:29 +08:00
afc163
0cbf1b9cc3 update modal demos 2015-06-12 17:37:39 +08:00
afc163
2dc587269f update modal demos 2015-06-12 17:11:32 +08:00
yiminghe
90241a7efe fix prefixCls 2015-06-12 12:01:02 +08:00
yiminghe
3690b2888d pass lint 2015-06-11 16:35:36 +08:00
yiminghe
c634b4d14c add confirm 2015-06-10 22:02:13 +08:00
afc163
55041219f2 Add eslint, close #14 2015-06-10 17:59:32 +08:00
afc163
ab6599b367 update modal demo 2015-06-10 16:43:35 +08:00