Merge branch '2.4.0' into ordered-list

ProjectMirador · Apr 5, 2017 · bb3647e · bb3647e
2 parents 13ce20f + b8739dd
commit bb3647e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/js/src/annotations/annotationTooltip.js b/js/src/annotations/annotationTooltip.js
@@ -364,11 +364,11 @@
         //if it is a manifest annotation, don't allow editing or deletion
         //otherwise, check annotation in endpoint
         var showUpdate = false;
-        if (annotation.endpoint !== 'manifest') {
+        if (typeof annotation.endpoint !== 'undefined' && annotation.endpoint !== 'manifest') {
           showUpdate = annotation.endpoint.userAuthorize('update', annotation);
         }
         var showDelete = false;
-        if (annotation.endpoint !== 'manifest') {
+        if (typeof annotation.endpoint !== 'undefined' && annotation.endpoint !== 'manifest') {
           showDelete = annotation.endpoint.userAuthorize('delete', annotation);
         }
         htmlAnnotations.push({