Show orphans and sort by text position selector

The positions of the anchors are no longer needed.

h/static/scripts/annotator/guest.coffee

@@ -197,10 +197,11 @@ module.exports = class Guest extends Annotator
 
     sync = (anchors) ->
       # Store the results of anchoring.
-      annotation.$orphan = anchors.length > 0
+      annotation.$anchored = anchors.length is 0
       for anchor in anchors
         if anchor.range?
-          annotation.$orphan = false
+          annotation.$anchored = true
+          break
 
       # Add the anchors for this annotation to instance storage.
       self.anchors = self.anchors.concat(anchors)

h/static/scripts/annotator/test/guest-test.coffee

@@ -249,28 +249,28 @@ describe 'Guest', ->
     afterEach ->
       document.body.removeChild(el)
 
-    it "doesn't declare annotation without targets as orphans", (done) ->
+    it "declares annotations without targets as anchored", (done) ->
       guest = createGuest()
       annotation = target: []
       guest.anchor(annotation).then ->
-        assert.isFalse(annotation.$orphan)
-        done()
+        assert.isTrue(annotation.$anchored)
+      .then(done, done)
 
-    it "doesn't declare annotations with a working target as orphans", (done) ->
+    it "declares annotations with a working target anchored", (done) ->
       guest = createGuest()
       annotation = target: [{selector: "test"}]
       sandbox.stub(anchoring, 'anchor').returns(Promise.resolve(range))
       guest.anchor(annotation).then ->
-        assert.isFalse(annotation.$orphan)
-        done()
+        assert.isTrue(annotation.$anchored)
+      .then(done, done)
 
-    it "declares annotations with broken targets as orphans", (done) ->
+    it "declares annotations with broken targets not anchored", (done) ->
       guest = createGuest()
       annotation = target: [{selector: 'broken selector'}]
       sandbox.stub(anchoring, 'anchor').returns(Promise.reject())
       guest.anchor(annotation).then ->
-        assert.isTrue(annotation.$orphan)
-        done()
+        assert.isFalse(annotation.$anchored)
+      .then(done, done)
 
     it 'updates the cross frame and bucket bar plugins', (done) ->
       guest = createGuest()
@@ -282,7 +282,7 @@ describe 'Guest', ->
       guest.anchor(annotation).then ->
         assert.called(guest.plugins.BucketBar.update)
         assert.called(guest.plugins.CrossFrame.sync)
-        done()
+      .then(done, done)
 
     it 'returns a promise of the anchors for the annotation', (done) ->
       guest = createGuest()
@@ -292,7 +292,7 @@ describe 'Guest', ->
       target = [{selector: []}]
       guest.anchor({target: [target]}).then (anchors) ->
         assert.equal(anchors.length, 1)
-        done()
+      .then(done, done)
 
     it 'adds the anchor to the "anchors" instance property"', (done) ->
       guest = createGuest()
@@ -307,7 +307,7 @@ describe 'Guest', ->
         assert.strictEqual(guest.anchors[0].target, target)
         assert.strictEqual(guest.anchors[0].range, range)
         assert.strictEqual(guest.anchors[0].highlights, highlights)
-        done()
+      .then(done, done)
 
     it 'destroys targets that have been removed from the annotation', (done) ->
       annotation = {}
@@ -321,7 +321,7 @@ describe 'Guest', ->
         assert.equal(guest.anchors.length, 0)
         assert.calledOnce(removeHighlights, highlights)
         assert.calledWith(removeHighlights, highlights)
-        done()
+      .then(done, done)
 
     it 'does not reanchor targets that are already anchored', (done) ->
       guest = createGuest()
@@ -331,7 +331,7 @@ describe 'Guest', ->
         guest.anchor(annotation).then ->
           assert.equal(guest.anchors.length, 1)
           assert.calledOnce(stub)
-          done()
+      .then(done, done)
 
   describe 'detach()', ->
     it 'removes the anchors from the "anchors" instance variable', ->

h/static/scripts/cross-frame.coffee

@@ -18,7 +18,7 @@ module.exports = class CrossFrame
       new Discovery($window, options)
 
     createAnnotationSync = ->
-      whitelist = ['$highlight', '$orphan','target', 'document', 'uri']
+      whitelist = ['$anchored', '$highlight', 'target', 'document', 'uri']
       options =
         formatter: (annotation) ->
           formatted = {}

h/static/scripts/widget-controller.coffee

@@ -57,12 +57,27 @@ module.exports = class WidgetController
         crossframe.call('scrollToAnnotation', annotation.$$tag)
 
     $scope.shouldShowThread = (container) ->
-      if annotationUI.hasSelectedAnnotations() and not container.parent.parent
-        annotationUI.isAnnotationSelected(container.message?.id)
-      else
-        true
+      # Show stubs
+      if not container?.message?
+        return true
+
+      # Show replies
+      if container.message.references?.length
+        return true
+
+      # Show selected threads
+      if annotationUI.hasSelectedAnnotations()
+        return annotationUI.isAnnotationSelected(container.message.id)
+
+      # Show regardless of $anchored if that feature is turned on
+      if $scope.feature('show_unanchored_annotations')
+        return true
+
+      # Show anchored threads
+      if container.message.$anchored
+        return true
+
+      return false
 
     $scope.hasFocus = (annotation) ->
       !!($scope.focusedAnnotations ? {})[annotation?.$$tag]
-
-    $scope.notOrphan = (container) -> !container?.message?.$orphan

h/static/styles/threads.scss

@@ -71,3 +71,11 @@ $thread-padding: 1em;
 .thread-load-more {
   clear: both;
 }
+
+.thread-anchor-notice {
+  // XXX: negative margins here make me sad; maybe refactor container
+  background-color: lighten($gray-light, 38%);
+  border-top: solid 1px $gray-lighter;
+  margin: 0 -1em -1em -1em;
+  padding: 1em;
+}

h/templates/client/thread.html

@@ -45,3 +45,7 @@
       ng-show="vm.shouldShowAsReply()">
   </li>
 </ul>
+
+<footer class="thread-anchor-notice" ng-if="!vm.container.message.$anchored">
+  <em>We can't find the exact position of this annotation.</em>
+</footer>

h/templates/client/viewer.html

@@ -43,7 +43,7 @@
       ng-mouseenter="focus(child.message)"
       ng-click="scrollTo(child.message)"
       ng-mouseleave="focus()"
-      ng-repeat="child in threadRoot.children | filter:notOrphan | orderBy : sort.predicate"
+      ng-repeat="child in threadRoot.children | orderBy : sort.predicate"
       ng-show="shouldShowThread(child) && (count('edit') || count('match') || !threadFilter.active()) || vm.isNew()">
   </li>
 </ul>