Merge pull request #887 from kossebau/annotationOT

OT for annotation ops

Author: Friedrich

programs/editor/wodocollabtexteditor.js

@@ -179,7 +179,7 @@ window.Wodo = window.Wodo || (function () {
             imageEditingEnabled = isEnabled(editorOptions.imageEditingEnabled, true),
             hyperlinkEditingEnabled = isEnabled(editorOptions.hyperlinkEditingEnabled, true),
             reviewModeEnabled = isEnabled(editorOptions.reviewModeEnabled, true),
-            annotationsEnabled = reviewModeEnabled || isEnabled(editorOptions.annotationsEnabled, true),
+            annotationsEnabled = reviewModeEnabled || isEnabled(editorOptions.annotationsEnabled),
             undoRedoEnabled = false, // no proper mechanism yet for collab
             zoomingEnabled = isEnabled(editorOptions.zoomingEnabled),
             //

webodf/lib/manifest.json

@@ -505,11 +505,13 @@
         "ops.OperationFactory"
     ],
     "ops.OperationTransformMatrix": [
+        "ops.OpAddAnnotation",
         "ops.OpAddStyle",
         "ops.OpApplyDirectStyling",
         "ops.OpInsertText",
         "ops.OpMergeParagraph",
         "ops.OpMoveCursor",
+        "ops.OpRemoveAnnotation",
         "ops.OpRemoveCursor",
         "ops.OpRemoveStyle",
         "ops.OpRemoveText",