Skip to content

Commit f632956

Browse files
author
Friedrich W. H. Kossebau
committed
In OpRemoveAnnotation just drop markup for the one annotation removed
1 parent 3947a38 commit f632956

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

webodf/lib/gui/AnnotationViewManager.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ gui.AnnotationViewManager = function AnnotationViewManager(canvas, odfFragment,
385385
showAnnotationsPane(false);
386386
}
387387
}
388+
this.forgetAnnotation = forgetAnnotation;
388389

389390
/**
390391
* Untracks, unwraps, and unhighlights all annotations

webodf/lib/odf/OdfCanvas.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,12 +1291,13 @@
12911291
};
12921292

12931293
/**
1294-
* Stops annotations and unwraps it
1294+
* Stops an annotation and unwraps it
1295+
* @param {!odf.AnnotationElement} annotation
12951296
* @return {undefined}
12961297
*/
1297-
this.forgetAnnotations = function () {
1298+
this.forgetAnnotation = function (annotation) {
12981299
if (annotationViewManager) {
1299-
annotationViewManager.forgetAnnotations();
1300+
annotationViewManager.forgetAnnotation(annotation);
13001301
fixContainerSize();
13011302
}
13021303
};

webodf/lib/ops/OpRemoveAnnotation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ops.OpRemoveAnnotation = function OpRemoveAnnotation() {
7272
annotationEnd = annotationNode.annotationEndElement;
7373

7474
// Untrack and unwrap annotation
75-
odtDocument.getOdfCanvas().forgetAnnotations();
75+
odtDocument.getOdfCanvas().forgetAnnotation(annotationNode);
7676

7777
/**
7878
* @param {!Node} node

0 commit comments

Comments
 (0)