Call OdtDocument op exec wrapper methods directly from session, not by signal

Author: Friedrich W. H. Kossebau

webodf/lib/ops/OdtDocument.js

@@ -437,15 +437,24 @@ ops.OdtDocument = function OdtDocument(odfCanvas) {
         return {textNode: lastTextNode, offset: nodeOffset };
     }
 
+    /**
+     * @param {!ops.Operation} op
+     * @return {undefined}
+     */
+    this.prepareOperationExecution = function(op) {
+        eventNotifier.emit(ops.OdtDocument.signalOperationStart, op);
+    };
+
     /**
      * Called after an operation is executed, this
      * function will check if the operation is an
      * 'edit', and in that case will update the
      * document's metadata, such as dc:creator,
      * meta:editing-cycles, and dc:creator.
      * @param {!ops.Operation} op
+     * @return {undefined}
      */
-    function handleOperationExecuted(op) {
+    this.finishOperationExecution = function (op) {
         var opspec = op.spec(),
             memberId = opspec.memberid,
             date = new Date(opspec.timestamp).toISOString(),
@@ -487,9 +496,14 @@ ops.OdtDocument = function OdtDocument(odfCanvas) {
             }
 
             lastEditingOp = op;
-            self.emit(ops.OdtDocument.signalMetadataUpdated, changedMetadata);
         }
-    }
+
+        eventNotifier.emit(ops.OdtDocument.signalOperationEnd, op);
+
+        if (op.isEdit) {
+            eventNotifier.emit(ops.OdtDocument.signalMetadataUpdated, changedMetadata);
+        }
+    };
 
     /**
      * Upgrades literal whitespaces (' ') to <text:s> </text:s>,
@@ -979,7 +993,6 @@ ops.OdtDocument = function OdtDocument(odfCanvas) {
         filter = new ops.TextPositionFilter();
         stepUtils = new odf.StepUtils();
         stepsTranslator = new ops.OdtStepsTranslator(rootNode, createPositionIterator(rootNode), filter, 500);
-        eventNotifier.subscribe(ops.OdtDocument.signalOperationEnd, handleOperationExecuted);
         eventNotifier.subscribe(ops.OdtDocument.signalProcessingBatchEnd, core.Task.processTasks);
     }
     init();

webodf/lib/ops/Session.js

@@ -81,9 +81,9 @@ ops.Session = function Session(odfCanvas) {
         operationRouter.subscribe(ops.OperationRouter.signalProcessingBatchStart, forwardBatchStart);
         operationRouter.subscribe(ops.OperationRouter.signalProcessingBatchEnd, forwardBatchEnd);
         opRouter.setPlaybackFunction(function (op) {
-            odtDocument.emit(ops.OdtDocument.signalOperationStart, op);
+            odtDocument.prepareOperationExecution(op);
             if (op.execute(odtDocument)) {
-                odtDocument.emit(ops.OdtDocument.signalOperationEnd, op);
+                odtDocument.finishOperationExecution(op);
                 return true;
             }
             return false;

webodf/tests/gui/MetadataControllerTests.js

@@ -84,9 +84,10 @@ gui.MetadataControllerTests = function MetadataControllerTests(runner) {
 
                 // need to set the timestamp, otherwise things fail in odtDocument
                 opspec.timestamp = Date.now();
-                timedOp = operationFactory.create(opspec);
+                timedOp = /**@type {!ops.Operation}*/(operationFactory.create(opspec));
+                odtDocument.prepareOperationExecution(timedOp);
                 if (timedOp.execute(odtDocument)) {
-                    odtDocument.emit(ops.OdtDocument.signalOperationEnd, timedOp);
+                    odtDocument.finishOperationExecution(timedOp);
                 }
             });
         };

webodf/tests/manifest.json

@@ -229,6 +229,7 @@
         "ops.Document",
         "ops.Member",
         "ops.OdtDocument",
+        "ops.Operation",
         "ops.OperationFactory",
         "ops.OperationTestHelper",
         "xmldom.LSSerializer"

webodf/tests/ops/OperationTests.js

@@ -288,10 +288,11 @@ ops.OperationTests = function OperationTests(runner) {
 
         // execute test ops
         for (i = 0; i < test.ops.length; i += 1) {
-            op = factory.create(test.ops[i]);
+            op = /**@type {!ops.Operation}*/(factory.create(test.ops[i]));
+            t.odtDocument.prepareOperationExecution(op);
             op.execute(t.odtDocument);
             if (metabefore) {
-                t.odtDocument.emit(ops.OdtDocument.signalOperationEnd, op);
+                t.odtDocument.finishOperationExecution(op);
             }
             checkForEmptyTextNodes(t.odtDocument.getCanvas().getElement());
         }