Update the truncated state of the annotation when the feature flag changes

If the enabled state of the annotation changes after the view
loaded, the truncation state did not update.

With the current feature flag implementation this typically happens
if the feature flags load after the session data has been received.
In future the intention is to make feature flags part of the session
data payload so this won't happen.

h/static/scripts/directive/annotation.js

@@ -304,7 +304,7 @@ function AnnotationController(
     /** Determines whether controls to expand/collapse the annotation body
      * are displayed adjacent to the tags field.
      */
-    vm.canCollapseBody = true;
+    vm.canCollapseBody = false;
 
     /** Determines whether the annotation body should be collapsed. */
     vm.collapseBody = true;

h/static/scripts/directive/excerpt.js

@@ -48,11 +48,20 @@ function excerpt($timeout) {
     controller: ExcerptController,
     controllerAs: 'vm',
     link: function (scope, elem, attrs, ctrl) {
-      if (!ctrl.enabled()) {
-        return;
+      var contentElem;
+
+      function checkForOverflowChange() {
+        scope.$digest();
+      }
+
+      function updateContentMaxHeight() {
+        if (ctrl.collapse) {
+          contentElem.style.maxHeight = toPx(ctrl.collapsedHeight);
+        } else {
+          contentElem.style.maxHeight = toPx(contentElem.scrollHeight);
+        }
       }
 
-      var contentElem;
       ctrl.overflowing = function overflowing() {
         if (!contentElem) {
           return false;
@@ -61,35 +70,37 @@ function excerpt($timeout) {
       };
 
       scope.$evalAsync(function () {
+        scope.$watch('vm.enabled()', function (isEnabled) {
+          if (isEnabled) {
             contentElem = elem[0].querySelector('.excerpt');
 
-        // update max height
-        scope.$watch('vm.collapse', function (isCollapsed) {
-          if (isCollapsed) {
-            contentElem.style.maxHeight = toPx(ctrl.collapsedHeight);
+            // trigger a recalculation of ctrl.overflowing() and properties
+            // which depend upon it when embedded media loads.
+            //
+            // In future we might wish to trigger checking for other events
+            // outside of Angular's knowledge as well, eg. loading of embedded
+            // media
+            contentElem.addEventListener('load', checkForOverflowChange,
+              true /* capture. 'load' events do not bubble */);
+
+            updateContentMaxHeight();
           } else {
-            contentElem.style.maxHeight = toPx(contentElem.scrollHeight);
+            contentElem = undefined;
           }
         });
 
+        scope.$watch('vm.collapse', function (isCollapsed) {
+          if (!contentElem) {
+            return;
+          }
+          updateContentMaxHeight();
+        });
+
         scope.$watch('vm.overflowing()', function () {
           if (ctrl.onCollapsibleChanged) {
             ctrl.onCollapsibleChanged({collapsible: ctrl.overflowing()});
           }
         });
-
-        function checkForOverflowChange() {
-          scope.$digest();
-        }
-
-        // trigger a recalculation of ctrl.overflowing() and properties
-        // which depend upon it when embedded media loads.
-        //
-        // In future we might wish to trigger checking for other events
-        // outside of Angular's knowledge as well, eg. loading of embedded
-        // media
-        contentElem.addEventListener('load', checkForOverflowChange,
-          true /* capture. 'load' events do not bubble */);
       });
     },
     scope: {
@@ -107,7 +118,7 @@ function excerpt($timeout) {
       /** Called when the collapsibility of the excerpt (that is, whether or
        * not the content height exceeds the collapsed height), changes.
        */
-      onCollapsibleChanged: '&',
+      onCollapsibleChanged: '&?',
       /** The height of this container in pixels when collapsed.
        */
       collapsedHeight: '=',