Skip to content

enable modal #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivanbogdanov merged 1 commit into from Oct 8, 2015
Merged

enable modal #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion components/SLDSModal/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ module.exports = React.createClass( {
},

componentDidMount () {
Modal.setAppElement(SLDSSettings.getAppElement());
//console.log('!!! window.activeElement !!! ',document.activeElement);
this.setState({returnFocusTo:document.activeElement})
if(!this.state.revealed){
Expand Down
5 changes: 4 additions & 1 deletion components/SLDSSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
*/

'use strict';
import Modal from 'react-modal';


let assetsPath = 'assets/';
let appRoot;
Expand All @@ -25,9 +27,10 @@ module.exports = {
setAppElement: (el)=>{
if(el){
appRoot = el;
Modal.setAppElement(el);
}
},
getAppElement: ()=>{
return appRoot;
}
};
};
10 changes: 5 additions & 5 deletions components/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
import SLDSPicklistBase from './SLDSPicklistBase';
import SLDSSettings from './SLDSSettings';
import SLDSButton from './SLDSButton';
//import SLDSModal from './SLDSModal';
//import SLDSModalTrigger from './SLDSModal/trigger';
import SLDSModal from './SLDSModal';
import SLDSModalTrigger from './SLDSModal/trigger';

module.exports = {
SLDSPicklistBase: SLDSPicklistBase,
SLDSSettings: SLDSSettings,
SLDSButton: SLDSButton,
// SLDSModal: SLDSModal,
// SLDSModalTrigger: SLDSModalTrigger
};
SLDSModal: SLDSModal,
SLDSModalTrigger: SLDSModalTrigger
};