1 files changed, 9 insertions, 12 deletions
diff --git a/animism-align/frontend/app/views/paragraph/paragraph.container.js b/animism-align/frontend/app/views/paragraph/paragraph.container.js
index ea1c797..71af036 100644
--- a/animism-align/frontend/app/views/paragraph/paragraph.container.js
+++ b/animism-align/frontend/app/views/paragraph/paragraph.container.js
@@ -11,19 +11,17 @@ import { Loader } from 'app/common'
 import ParagraphEditor from './containers/paragraphEditor.container'
 
 class ParagraphContainer extends Component {
+  constructor(props) {
+    super(props)
+    this.handleKeyDown = this.handleKeyDown.bind(this)
+  }
   componentDidMount() {
-    this.bind()
+    document.addEventListener('keydown', this.handleKeyDown)
   }
   componentWillUnmount() {
-    this.unbind()
-  }
-  bind() {
-    document.addEventListener('keydown', this.handleKeydown)
-  }
-  unbind() {
-    document.removeEventListener('keydown', this.handleKeydown)
+    document.removeEventListener('keydown', this.handleKeyDown)
   }
-  handleKeydown(e) {
+  handleKeyDown(e) {
     if (document.activeElement !== document.body) {
       return
     }
@@ -46,7 +44,7 @@ class ParagraphContainer extends Component {
     }
   }
   render() {
-    if (!this.props.annotation.lookup || !this.props.paragraph.lookup) {
+    if (!this.props.loaded) {
       return <div className='body loading'><Loader /></div>
     }
     return (
@@ -58,8 +56,7 @@ class ParagraphContainer extends Component {
 }
 
 const mapStateToProps = state => ({
-  paragraph: state.paragraph.index,
-  annotation: state.annotation.index,
+  loaded: !!state.annotation.lookup && !!state.paragraph.lookup && !!state.media.lookup
 })
 
 const mapDispatchToProps = dispatch => ({