Merge pull request #2034 from hypothesis/2033-fix-focusing

Fix sidebar's focusing on annotation cards

h/static/scripts/annotation-ui-service.coffee

@@ -13,7 +13,7 @@ createAnnotationUI = ->
 
     visibleHighlights: false
 
-    # Contains a map of annotation id:true pairs.
+    # Contains a map of annotation tag:true pairs.
     focusedAnnotationMap: null
 
     # Contains a map of annotation id:true pairs.
@@ -28,7 +28,7 @@ createAnnotationUI = ->
     ###
     focusAnnotations: (annotations) ->
       selection = {}
-      selection[id] = true for {id} in annotations
+      selection[$$tag] = true for {$$tag} in annotations
       @focusedAnnotationMap = value(selection)
 
     ###*

h/static/scripts/controllers.coffee

@@ -251,7 +251,7 @@ class ViewerController
         true
 
     $scope.hasFocus = (annotation) ->
-      annotation?.$$tag in ($scope.focusedAnnotations ? [])
+      !!($scope.focusedAnnotations ? {})[annotation?.$$tag]
 
 angular.module('h')
 .controller('AppController', AppController)

h/static/scripts/test/annotation-ui-service-test.coffee

@@ -17,25 +17,25 @@ describe 'AnnotationUI', ->
 
   describe '.focusAnnotations()', ->
     it 'adds the passed annotations to the focusedAnnotationMap', ->
-      annotationUI.focusAnnotations([{id: 1}, {id: 2}, {id: 3}])
+      annotationUI.focusAnnotations([{$$tag: 1}, {$$tag: 2}, {$$tag: 3}])
       assert.deepEqual(annotationUI.focusedAnnotationMap, {
         1: true, 2: true, 3: true
       })
 
     it 'replaces any annotations originally in the map', ->
       annotationUI.focusedAnnotationMap = {1: true}
-      annotationUI.focusAnnotations([{id: 2}, {id: 3}])
+      annotationUI.focusAnnotations([{$$tag: 2}, {$$tag: 3}])
       assert.deepEqual(annotationUI.focusedAnnotationMap, {
         2: true, 3: true
       })
 
     it 'does not modify the original map object', ->
       orig = annotationUI.focusedAnnotationMap = {1: true}
-      annotationUI.focusAnnotations([{id: 2}, {id: 3}])
+      annotationUI.focusAnnotations([{$$tag: 2}, {$$tag: 3}])
       assert.notEqual(annotationUI.focusedAnnotationMap, orig)
 
     it 'nulls the map if no annotations are focused', ->
-      orig = annotationUI.focusedAnnotationMap = {1: true}
+      orig = annotationUI.focusedAnnotationMap = {$$tag: true}
       annotationUI.focusAnnotations([])
       assert.isNull(annotationUI.focusedAnnotationMap)