Let events about added/removed steps part be part of operation event stack

Author: Friedrich W. H. Kossebau

webodf/lib/ops/OdtDocument.js

@@ -991,8 +991,6 @@ ops.OdtDocument = function OdtDocument(odfCanvas) {
      */
     this.handleStepsInserted = function(args) {
         stepsTranslator.handleStepsInserted(args);
-        // signal not used in webodf, but 3rd-party (NVivo)
-        eventNotifier.emit(ops.OdtDocument.signalStepsInserted, args);
     };
 
     /**
@@ -1003,8 +1001,6 @@ ops.OdtDocument = function OdtDocument(odfCanvas) {
      */
     this.handleStepsRemoved = function(args) {
         stepsTranslator.handleStepsRemoved(args);
-        // signal not used in webodf, but 3rd-party (NVivo)
-        eventNotifier.emit(ops.OdtDocument.signalStepsRemoved, args);
     };
 
     /**

webodf/lib/ops/OpAddAnnotation.js

@@ -161,6 +161,11 @@ ops.OpAddAnnotation = function OpAddAnnotation() {
         }
         insertNodeAtPosition(odtDocument, annotation, position);
         odtDocument.handleStepsInserted({position: position});
+        // signal not used in webodf, but 3rd-party (NVivo)
+        events.push({
+            eventid: ops.OdtDocument.signalStepsInserted,
+            args: { position: position }
+        });
 
         // Move the cursor inside the new annotation,
         // by selecting the paragraph's range.

webodf/lib/ops/OpInsertImage.js

@@ -86,7 +86,8 @@ ops.OpInsertImage = function OpInsertImage() {
         var odtDocument = /**@type{ops.OdtDocument}*/(document),
             odfCanvas = odtDocument.getOdfCanvas(),
             domPosition = odtDocument.getTextNodeAtStep(position, memberid),
-            textNode, refNode, paragraphElement, frameElement;
+            textNode, refNode, paragraphElement, frameElement,
+            events = [];
 
         if (!domPosition) {
             return null;
@@ -99,6 +100,11 @@ ops.OpInsertImage = function OpInsertImage() {
         frameElement = createFrameElement(odtDocument.getDOMDocument());
         textNode.parentNode.insertBefore(frameElement, refNode);
         odtDocument.handleStepsInserted({position: position});
+        // signal not used in webodf, but 3rd-party (NVivo)
+        events.push({
+            eventid: ops.OdtDocument.signalStepsInserted,
+            args: { position: position }
+        });
 
         // clean up any empty text node which was created by odtDocument.getTextNodeAtStep
         if (textNode.length === 0) {
@@ -109,14 +115,16 @@ ops.OpInsertImage = function OpInsertImage() {
         odfCanvas.refreshCSS();
         odfCanvas.rerenderAnnotations();
 
-        return [{
+        events.push({
             eventid: ops.OdtDocument.signalParagraphChanged,
             args: {
                 paragraphElement: paragraphElement,
                 memberId: memberid,
                 timeStamp: timestamp
             }
-        }];
+        });
+
+        return events;
     };
 
     /**

webodf/lib/ops/OpInsertTable.js

@@ -149,7 +149,8 @@ ops.OpInsertTable = function OpInsertTable() {
             domPosition = odtDocument.getTextNodeAtStep(position),
             rootNode = odtDocument.getRootNode(),
             previousSibling,
-            tableNode;
+            tableNode,
+            events = [];
 
         if (domPosition) {
             tableNode = createTableNode(odtDocument.getDOMDocument());
@@ -159,17 +160,24 @@ ops.OpInsertTable = function OpInsertTable() {
             rootNode.insertBefore(tableNode, previousSibling.nextSibling);
             // The parent table counts for 1 position, and 1 paragraph is added per cell
             odtDocument.handleStepsInserted({position: position});
+            // signal not used in webodf, but 3rd-party (NVivo)
+            events.push({
+                eventid: ops.OdtDocument.signalStepsInserted,
+                args: { position: position }
+            });
 
             odtDocument.getOdfCanvas().refreshSize();
             odtDocument.getOdfCanvas().rerenderAnnotations();
-            return [{
+            events.push({
                 eventid: ops.OdtDocument.signalTableAdded,
                 args: {
                     tableElement: tableNode,
                     memberId: memberid,
                     timeStamp: timestamp
                 }
-            }];
+            });
+
+            return events;
         }
         return null;
     };

webodf/lib/ops/OpInsertText.js

@@ -189,6 +189,11 @@ ops.OpInsertText = function OpInsertText() {
             }
 
             odtDocument.handleStepsInserted({position: position});
+            // signal not used in webodf, but 3rd-party (NVivo)
+            events.push({
+                eventid: ops.OdtDocument.signalStepsInserted,
+                args: { position: position }
+            });
 
             if (cursor && moveCursor) {
                 // Explicitly place the cursor in the desired position after insertion

webodf/lib/ops/OpMergeParagraph.js

@@ -246,6 +246,11 @@ ops.OpMergeParagraph = function OpMergeParagraph() {
 
         // Merging removes a single step between the boundary of the two paragraphs
         odtDocument.handleStepsRemoved({position: sourceStartPosition - 1});
+        // signal not used in webodf, but 3rd-party (NVivo)
+        events.push({
+            eventid: ops.OdtDocument.signalStepsRemoved,
+            args: { position: sourceStartPosition - 1 }
+        });
 
         // Downgrade trailing spaces at the end of the destination paragraph, and the beginning of the source paragraph.
         // These are the only two places that might need downgrading as a result of the merge.

webodf/lib/ops/OpRemoveAnnotation.js

@@ -59,7 +59,8 @@ ops.OpRemoveAnnotation = function OpRemoveAnnotation() {
             iterator = odtDocument.getIteratorAtPosition(position),
             container = iterator.container(),
             annotationNode,
-            annotationEnd;
+            annotationEnd,
+            events = [];
 
         while (!(container.namespaceURI === odf.Namespaces.officens
             && container.localName === 'annotation')) {
@@ -92,11 +93,16 @@ ops.OpRemoveAnnotation = function OpRemoveAnnotation() {
         }
         // The specified position is the first walkable step in the annotation. The position is always just before the first point of change
         odtDocument.handleStepsRemoved({position: position > 0 ? position - 1 : position});
+        // signal not used in webodf, but 3rd-party (NVivo)
+        events.push({
+            eventid: ops.OdtDocument.signalStepsRemoved,
+            args: { position: position > 0 ? position - 1 : position }
+        });
 
         odtDocument.getOdfCanvas().rerenderAnnotations();
         odtDocument.fixCursorPositions();
 
-        return [];
+        return events;
     };
 
     /**

webodf/lib/ops/OpRemoveText.js

@@ -94,6 +94,11 @@ ops.OpRemoveText = function OpRemoveText() {
         });
 
         odtDocument.handleStepsRemoved({position: position});
+        // signal not used in webodf, but 3rd-party (NVivo)
+        events.push({
+            eventid: ops.OdtDocument.signalStepsRemoved,
+            args: { position: position }
+        });
         odtDocument.downgradeWhitespacesAtPosition(position);
         odtDocument.fixCursorPositions();
         odtDocument.getOdfCanvas().refreshSize();

webodf/lib/ops/OpSplitParagraph.js

@@ -171,6 +171,11 @@ ops.OpSplitParagraph = function OpSplitParagraph() {
             domPosition.textNode.parentNode.removeChild(domPosition.textNode);
         }
         odtDocument.handleStepsInserted({position: position});
+        // signal not used in webodf, but 3rd-party (NVivo)
+        events.push({
+            eventid: ops.OdtDocument.signalStepsInserted,
+            args: { position: position }
+        });
 
         if (cursor && moveCursor) {
             odtDocument.moveCursor(memberid, position + 1, 0);