Merge pull request #1770 from hypothesis/thread-display

Move thread ng-show conditionals onto parent elements

h/templates/client/thread.html

@@ -18,19 +18,17 @@
 </article>
 
 <!-- Reply count -->
-<div class="thread-reply" ng-show="vm.showReplyToggle(count('message'))">
+<div class="thread-reply" ng-show="vm.showReplyToggle(count('message')) && (!threadFilter.active() || count('message') == count('match'))">
   <a class="reply-count small"
      href=""
-     ng-if="!threadFilter.active() || count('message') == count('match')"
      ng-pluralize count="count('message') - 1"
      when="{'0': '', one: '1 reply', other: '{} replies'}"></a>
 </div>
 
-<div class="thread-load-more" ng-show="threadFilter.active()">
+<div class="thread-load-more" ng-show="vm.container.message.id && threadFilter.active()">
   <a class="load-more small"
      href=""
      ng-click="threadFilter.active(false)"
-     ng-if="vm.container.message.id"
      ng-pluralize count="count('message') - count('match')"
      when="{'0': '',
            one: 'View one more in conversation',