displaying annotation list, click to select, doubleclick to show form, updating annotations

2 files changed, 5 insertions, 6 deletions

diff --git a/animism-align/frontend/views/align/containers/annotations.container.js b/animism-align/frontend/views/align/containers/annotations.container.js
index e32757b..b6cdace 100644
--- a/animism-align/frontend/views/align/containers/annotations.container.js
+++ b/animism-align/frontend/views/align/containers/annotations.container.js
@@ -11,15 +11,16 @@ import { clamp } from '../../../util'
 import { positionToTime } from '../align.util'
 
 import AnnotationForm from '../components/annotations/annotation.form'
+import AnnotationIndex from '../components/annotations/annotation.index'
 
 class Annotations extends Component {
   constructor(props){
     super(props)
-    // this.handleKeydown = this.handleKeydown.bind(this)
   }
   render() {
     return (
       <div className='annotations'>
+        <AnnotationIndex />
         {this.props.annotation.start_ts &&
           <AnnotationForm />
         }
@@ -28,11 +29,6 @@ class Annotations extends Component {
   }
 }
 
-/*
-- get the first sentence from the text
-- display the form at that point
-*/
-
 const mapStateToProps = state => ({
   timeline: state.align.timeline,
   annotation: state.align.annotation,
diff --git a/animism-align/frontend/views/align/containers/timeline.container.js b/animism-align/frontend/views/align/containers/timeline.container.js
index 4167d2d..23b9435 100644
--- a/animism-align/frontend/views/align/containers/timeline.container.js
+++ b/animism-align/frontend/views/align/containers/timeline.container.js
@@ -53,6 +53,9 @@ class Timeline extends Component {
     } else {
       // console.log(e.keyCode)
       switch (e.keyCode) {
+        case 27: // escape
+          actions.align.hideAnnotationForm()
+          break
         case 32: // spacebar
           actions.audio.toggle()
           break