Commit Graph

61 Commits

Author SHA1 Message Date
afc163
5ee64fe105 Add Modal.warning 2016-04-11 14:59:37 +08:00
afc163
4c60da7316 Modal.confirm, iconClassName => iconType 2016-04-11 14:57:29 +08:00
afc163
fbda3c7b88 Merge master into develop-1.0.0 2016-03-28 16:15:36 +08:00
afc163
7cee16d153 Fix alert icons style 2016-03-28 16:09:13 +08:00
Benjy Cui
5e4786440d deps: remove object-assign 2016-03-25 18:16:48 +08:00
Bruce Mitchener
11c0a6a203 Name classes without Ant* prefix.
Where necessary, prefix the classes imported from react-component
with 'Rc' rather than prefixing the Ant classes with 'Ant'.

The prefixing of Ant classes wasn't consistent and isn't necessary
in many cases.
2016-03-21 20:16:38 +07:00
afc163
a16903009e merge from master 2016-01-13 22:22:33 +08:00
Benjy Cui
7ae966873a fix: cyclic reference in Modal 2016-01-12 17:07:24 +08:00
Benjy Cui
b72d18fd44 style: update code style to please the fucking 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
Benjy Cui
fdd9ef7d18 feat: Modal should support internationalization 2015-11-24 11:01:36 +08:00
yiminghe
dc1650486d fix button 2015-11-03 20:06:44 +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
afc163
aed7eae2bc Fix confirmLoading 2015-10-20 10:45:49 +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
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
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
0ac1f76553 Fix visible state bug in handleCancel 2015-09-08 12:38:21 +08:00
afc163
75d710a1b8 Add some info type Modal, close #244 2015-09-07 11:48:57 +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
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
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
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
yiminghe
0a7410973e clean warning 2015-07-08 20:53:11 +08:00
yiminghe
abcdaddcaa support promise for modal 2015-06-25 15:29:56 +08:00
yiminghe
73d89f46af update motion 2015-06-15 21:18:08 +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
0cbf1b9cc3 update modal demos 2015-06-12 17:37:39 +08:00