Fix display of page search results

Each controller for the viewer template must now define a
shouldShowAnnotation method that accepts an annotation id and determines
whether it should be displayed. This moves the logic out of the template
and into the controllers.

h/static/scripts/controllers.coffee

@@ -295,6 +295,7 @@ class App
     $scope.clearSelection = ->
       $scope.search.query = ''
       $scope.selectedAnnotations = null
+      $scope.selectedAnnotationsCount = 0
 
     $scope.frame = visible: false
     $scope.id = identity
@@ -321,11 +322,14 @@ class AnnotationViewer
   constructor: ($routeParams, $scope, streamfilter) ->
     # Tells the view that these annotations are standalone
     $scope.isEmbedded = false
+    $scope.isStream = false
 
     # Provide no-ops until these methods are moved elsewere. They only apply
     # to annotations loaded into the stream.
     $scope.activate = angular.noop
 
+    $scope.shouldShowAnnotation = (id) -> true
+
     $scope.$watch 'updater', (updater) ->
       if updater?
         updater.then (sock) ->
@@ -340,18 +344,15 @@ class AnnotationViewer
 
 class Viewer
   this.$inject = [
-    '$location', '$routeParams', '$scope',
-    'annotator'
+    '$location', '$routeParams', '$scope', 'annotator'
   ]
-  constructor: (
-    $location, $routeParams, $scope,
-    annotator
-  ) ->
+  constructor: ($location, $routeParams, $scope, annotator) ->
     if $routeParams.q
       return $location.path('/page_search').replace()
 
     # Tells the view that these annotations are embedded into the owner doc
     $scope.isEmbedded = true
+    $scope.isStream = true
 
     {providers, threading} = annotator
 
@@ -367,6 +368,10 @@ class Viewer
           method: 'setActiveHighlights'
           params: highlights
 
+    $scope.shouldShowAnnotation = (id) ->
+      selectedAnnotations = $scope.selectedAnnotations
+      !selectedAnnotations or selectedAnnotations?[id]
+
 
 class Search
   this.$inject = ['$filter', '$location', '$routeParams', '$sce', '$scope',
@@ -378,6 +383,9 @@ class Search
 
     {providers, threading} = annotator
 
+    $scope.isEmbedded = true
+    $scope.isStream = true
+
     $scope.highlighter = '<span class="search-hl-active">$&</span>'
     $scope.filter_orderBy = $filter('orderBy')
     $scope.matches = []
@@ -391,6 +399,10 @@ class Search
       more_top_num : {}
       more_bottom_num: {}
 
+    $scope.shouldShowAnnotation = (id) ->
+      shownAnnotations = $scope.ann_info?.shown or {}
+      !!shownAnnotations[id]
+
     buildRenderOrder = (threadid, threads) =>
       unless threads?.length
         return

h/static/scripts/services.coffee

@@ -259,16 +259,22 @@ class Hypothesis extends Annotator
 
   toggleViewerSelection: (annotations=[]) =>
     scope = @element.scope()
+
     selected = scope.selectedAnnotations or {}
     for a in annotations
       if selected[a.id]
         delete selected[a.id]
       else
         selected[a.id] = true
-    if Object.keys(selected).length
+
+    count = Object.keys(selected).length
+    scope.selectedAnnotationsCount = count
+
+    if count
       scope.selectedAnnotations = selected
     else
       scope.selectedAnnotations = null
+
     this
 
   updateViewer: (annotations=[]) =>
@@ -281,6 +287,7 @@ class Hypothesis extends Annotator
     for a in annotations
       selected[a.id] = true
     scope.selectedAnnotations = selected
+    scope.selectedAnnotationsCount = Object.keys(selected).length
     this.show()
     this
 

h/static/scripts/streamsearch.coffee

@@ -26,6 +26,9 @@ class StreamSearch
     terms = searchfilter.generateFacetedFilter $scope.search.query
     queryparser.populateFilter streamfilter, terms
 
+    $scope.isEmbedded = false
+    $scope.isStream = true
+
     $scope.sort.name = 'Newest'