File tree 2 files changed +4
-4
lines changed
2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -70,8 +70,10 @@ var ModalPortal = module.exports = React.createClass({
70
70
} ,
71
71
72
72
maybeFocus : function ( ) {
73
- if ( this . props . isOpen )
73
+ if ( this . props . isOpen &&
74
+ ! this . refs . content . getDOMNode ( ) . contains ( document . activeElement ) ) {
74
75
this . focusContent ( ) ;
76
+ }
75
77
} ,
76
78
77
79
focusContent : function ( ) {
@@ -109,7 +111,7 @@ var ModalPortal = module.exports = React.createClass({
109
111
} ,
110
112
111
113
requestClose : function ( ) {
112
- if ( this . ownerHandlesClose )
114
+ if ( this . ownerHandlesClose ( ) )
113
115
this . props . onRequestClose ( ) ;
114
116
} ,
115
117
@@ -152,4 +154,3 @@ var ModalPortal = module.exports = React.createClass({
152
154
) ;
153
155
}
154
156
} ) ;
155
-
Original file line number Diff line number Diff line change 34
34
"karma-mocha" : " 0.1.3" ,
35
35
"mocha" : " 1.20.1" ,
36
36
"react" : " >=0.11.0" ,
37
- "react-tap-event-plugin" : " git://github.com/appsforartists/react-tap-event-plugin" ,
38
37
"reactify" : " ^0.14.0" ,
39
38
"rf-release" : " 0.3.1" ,
40
39
"uglify-js" : " 2.4.15" ,
You can’t perform that action at this time.
0 commit comments